ChangeLogTag: Thu Dec 11 17:57:34 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 132 insertions, 603 deletions

diff --git a/TAO/tests/RTScheduling/VoidData/Makefile b/TAO/tests/RTScheduling/VoidData/Makefile
index 5359ed3bd08..93598c146fe 100644
--- a/TAO/tests/RTScheduling/VoidData/Makefile
+++ b/TAO/tests/RTScheduling/VoidData/Makefile
@@ -16,7 +16,10 @@ BIN_UNCHECKED = VoidData
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED))
 
-CLIENT_OBJS = test_client.o testC.o 
+IDL_FILES = test
+IDL_SRC = testC.cpp testS.cpp
+
+CLIENT_OBJS = test_client.o testC.o
 
 BUILD = $(BIN)
 VBIN = $(BIN:%=%$(VAR))
@@ -46,11 +49,13 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
+
 VoidData: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) 
+	-$(RM)
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/tests/RTScheduling/VoidData/VoidData.bor b/TAO/tests/RTScheduling/VoidData/VoidData.bor
index 359eb33309f..07c09898ada 100644
--- a/TAO/tests/RTScheduling/VoidData/VoidData.bor
+++ b/TAO/tests/RTScheduling/VoidData/VoidData.bor
@@ -2,6 +2,7 @@
 
 NAME = VoidData
 
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I $(TAO_ROOT)
 
 OBJFILES = \
 	$(OBJDIR)\testC.obj \
@@ -37,8 +38,25 @@ CFLAGS = \
 
 CPPDIR = .
 
+IDLDIR = .
+
 INCLUDES = \
 	testC.h \
 	testC.i
 
+IDLFILES = \
+   $(IDLDIR)\test.idl
+
+all: idl_src_files
+
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
+
+# IDL File Directory: .
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+   $(TAO_IDL) -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/tests/RTScheduling/VoidData/VoidData.dsp b/TAO/tests/RTScheduling/VoidData/VoidData.dsp
index 0f955a05386..f4f391bc182 100644
--- a/TAO/tests/RTScheduling/VoidData/VoidData.dsp
+++ b/TAO/tests/RTScheduling/VoidData/VoidData.dsp
@@ -30,52 +30,39 @@ RSC=rc.exe
 

 !IF  "$(CFG)" == "VoidData - 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 "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

+# PROP Intermediate_Dir "Release\VoidData"

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../" /I "../../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\.." /I "..\..\..\tao" /I "..\..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x413

+# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\tao" /i "..\..\..\.." /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 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 TAO_RTCORBA.lib TAO_PortableServer.lib TAO_RTScheduler.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/RTCORBA" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/RTScheduling"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_RTScheduler.lib TAO_RTCORBA.lib TAO.lib ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\lib" /version:1.3.5

+# SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "VoidData - 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 Output_Dir "."

+# PROP Intermediate_Dir "Debug\VoidData"

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../../../" /I "../../../" /I "../../../tao/RTScheduling" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

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

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

-# SUBTRACT RSC /x

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "..\..\.." /I "..\..\..\tao" /I "..\..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x413

+# ADD RSC /l 0x409 /i "..\..\.." /i "..\..\..\tao" /i "..\..\..\.." /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 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 taod.lib TAO_RTCORBAd.lib TAO_PortableServerd.lib TAO_RTSchedulerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/RTCORBA" /libpath:"../../../tao/PortableServer" /libpath:"../../../tao/RTScheduling"

+# ADD BASE LINK32 /machine:IX86

+# ADD LINK32 advapi32.lib user32.lib TAO_RTSchedulerd.lib TAO_RTCORBAd.lib TAOd.lib ACEd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\lib" /version:1.3.5

+# SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

 

@@ -85,31 +72,110 @@ LINK32=link.exe
 # Name "VoidData - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat"

+# PROP Default_Filter "cpp;cxx;c"

 # Begin Source File

 

-SOURCE=.\test_client.cpp

+SOURCE=".\test_client.cpp"

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.cpp

+SOURCE=".\testC.cpp"

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# PROP Default_Filter "h;hpp;hxx;hh"

 # Begin Source File

 

-SOURCE=.\test.h

+SOURCE=".\testC.h"

 # End Source File

+# End Group

+# Begin Group "Inline Files"

+

+# PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=".\testC.i"

 # End Source File

 # End Group

-# Begin Group "Resource Files"

+# Begin Group "Documentation"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=".\README"

+# End Source File

+# End Group

+# Begin Group "IDL Files"

+

+# PROP Default_Filter "idl"

+# Begin Source File

+

+SOURCE=.\test.idl

+

+!IF  "$(CFG)" == "VoidData - Win32 Release"

+

+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)

+InputPath=.\test.idl

+InputName=test

+

+BuildCmds= \

+	PATH=%PATH%;..\..\..\..\lib \

+	..\..\..\..\bin\release\tao_idl -o . -I..\..\.. -I..\..\..\tao -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \

+	

+

+".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+".\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+".\$(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)" == "VoidData - Win32 Debug"

+

+# Begin Custom Build - Invoking IDL Compiler on $(InputPath)

+InputPath=.\test.idl

+InputName=test

+

+BuildCmds= \

+	PATH=%PATH%;..\..\..\..\lib \

+	..\..\..\..\bin\tao_idl -o . -I..\..\.. -I..\..\..\tao -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \

+	

+

+".\$(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 Group

 # End Target

 # End Project

diff --git a/TAO/tests/RTScheduling/VoidData/VoidData.mpc b/TAO/tests/RTScheduling/VoidData/VoidData.mpc
index 928f681b1b1..4ee65ea73a2 100644
--- a/TAO/tests/RTScheduling/VoidData/VoidData.mpc
+++ b/TAO/tests/RTScheduling/VoidData/VoidData.mpc
@@ -1,8 +1,8 @@
 project(VoidData) : rtscheduling_client {
+ exename = VoidData
  Source_Files {
     test_client.cpp
     testC.cpp
   }
-
-  exename = VoidData
 }
+
diff --git a/TAO/tests/RTScheduling/VoidData/test.pidl b/TAO/tests/RTScheduling/VoidData/test.idl
index 343b28f7675..34b3f733a73 100644
--- a/TAO/tests/RTScheduling/VoidData/test.pidl
+++ b/TAO/tests/RTScheduling/VoidData/test.idl
@@ -1,5 +1,5 @@
 //$Id$
-#include <tao/RTScheduling/RTScheduler.pidl>
+#include <tao/RTScheduling/RTScheduler_include.pidl>
 local interface test
 {
    void bar (in CORBA::VoidData data );
diff --git a/TAO/tests/RTScheduling/VoidData/testC.cpp b/TAO/tests/RTScheduling/VoidData/testC.cpp
deleted file mode 100644
index caf2bf8133a..00000000000
--- a/TAO/tests/RTScheduling/VoidData/testC.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:302
-
-
-#include "testC.h"
-#include "tao/Typecode.h"
-#include "tao/Any_Impl_T.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "testC.i"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
-
-// Arg traits specializations.
-namespace TAO
-{
-};
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for test.
-
-test_ptr
-TAO::Objref_Traits<test>::tao_duplicate (
-    test_ptr p
-  )
-{
-  return test::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<test>::tao_release (
-    test_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-test_ptr
-TAO::Objref_Traits<test>::tao_nil (void)
-{
-  return test::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<test>::tao_marshal (
-    test_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*_TAO_test_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-test::test (void)
-{}
-
-test::~test (void)
-{}
-
-void 
-test::_tao_any_destructor (void *_tao_void_pointer)
-{
-  test *_tao_tmp_pointer =
-    ACE_static_cast (test *, _tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-test_ptr
-test::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return test::_nil ();
-    }
-  
-  test_ptr proxy =
-    dynamic_cast<test_ptr> (_tao_objref);
-  
-  return test::_duplicate (proxy);
-}
-
-test_ptr
-test::_duplicate (test_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-CORBA::Boolean
-test::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:test:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* test::_interface_repository_id (void) const
-{
-  return "IDL:test:1.0";
-}
-
-CORBA::Boolean
-test::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_test[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  13,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x74657374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:test:1.0
-    5,
-  ACE_NTOHL (0x74657374), 
-  ACE_NTOHL (0x0),  // name = test
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_test (
-    CORBA::tk_objref,
-    sizeof (_oc_test),
-    (char *) &_oc_test,
-    0,
-    sizeof (test)
-  );
-
-::CORBA::TypeCode_ptr _tc_test =
-  &_tc_TAO_tc_test;
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<test>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<test>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<test>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    test_ptr _tao_elem
-  )
-{
-  test_ptr _tao_objptr =
-    test::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    test_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<test>::insert (
-      _tao_any,
-      test::_tao_any_destructor,
-      _tc_test,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    test_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<test>::extract (
-        _tao_any,
-        test::_tao_any_destructor,
-        _tc_test,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1702
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO::Objref_Traits<
-        test
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        test
-      >;
-  
-  template class
-    TAO_Objref_Out_T<
-        test
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        test
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        test \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        test
-      >
-  
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        test
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        test \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tests/RTScheduling/VoidData/testC.h b/TAO/tests/RTScheduling/VoidData/testC.h
deleted file mode 100644
index 1937d799539..00000000000
--- a/TAO/tests/RTScheduling/VoidData/testC.h
+++ /dev/null
@@ -1,211 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:151
-
-#ifndef _TAO_IDL_TESTC_H_
-#define _TAO_IDL_TESTC_H_
-
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Sequence_T.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/RTScheduling/RTScheduler.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root_ch.cpp:63
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:608
-
-#if !defined (_TEST__VAR_OUT_CH_)
-#define _TEST__VAR_OUT_CH_
-
-class test;
-typedef test *test_ptr;
-
-typedef
-  TAO_Objref_Var_T<
-      test
-    >
-  test_var;
-
-typedef
-  TAO_Objref_Out_T<
-      test
-    >
-  test_out;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_TEST_CH_)
-#define _TEST_CH_
-
-class  test
-  : public virtual CORBA::Object
-{
-public:
-  typedef test_ptr _ptr_type;
-  typedef test_var _var_type;
-
-  // The static operations.
-  static test_ptr _duplicate (test_ptr obj);
-
-  static test_ptr _narrow (
-      CORBA::Object_ptr obj
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  static test_ptr _nil (void)
-    {
-      return (test_ptr)0;
-    }
-
-  static void _tao_any_destructor (void *);
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/operation_ch.cpp:46
-
-  virtual void bar (
-      CORBA::VoidData data
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:186
-
-  virtual CORBA::Boolean _is_a (
-      const char *type_id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    );
-
-  virtual const char* _interface_repository_id (void) const;
-  virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-protected:
-  test (void);
-  virtual ~test (void);
-
-private:
-  test (const test &);
-  void operator= (const test &);
-};
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_decl.cpp:44
-
-extern  ::CORBA::TypeCode_ptr  _tc_test;
-
-// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:48
-
-// Traits specializations.
-namespace TAO
-{
-};
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
- void operator<<= (CORBA::Any &, test_ptr); // copying
- void operator<<= (CORBA::Any &, test_ptr *); // non-copying
- CORBA::Boolean operator>>= (const CORBA::Any &, test_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:920
-
-#if defined (__ACE_INLINE__)
-#include "testC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
diff --git a/TAO/tests/RTScheduling/VoidData/testC.i b/TAO/tests/RTScheduling/VoidData/testC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tests/RTScheduling/VoidData/testC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-