summaryrefslogtreecommitdiff
path: root/tests/Nested_Event_Loop
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Nested_Event_Loop')
-rw-r--r--tests/Nested_Event_Loop/Makefile.am115
-rw-r--r--tests/Nested_Event_Loop/client.cpp3
-rw-r--r--tests/Nested_Event_Loop/server.cpp4
-rw-r--r--tests/Nested_Event_Loop/test_i.cpp2
4 files changed, 1 insertions, 123 deletions
diff --git a/tests/Nested_Event_Loop/Makefile.am b/tests/Nested_Event_Loop/Makefile.am
deleted file mode 100644
index 82890659246..00000000000
--- a/tests/Nested_Event_Loop/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-## Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC. Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/ace_gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Nested_Event_Loop_Idl.am
-
-BUILT_SOURCES = \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-CLEANFILES = \
- test-stamp \
- testC.cpp \
- testC.h \
- testC.inl \
- testS.cpp \
- testS.h \
- testS.inl
-
-testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl: test-stamp
-
-test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
- $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
- @touch $@
-
-noinst_HEADERS = \
- test.idl
-
-## Makefile.Nested_Event_Loop_Client.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-client_SOURCES = \
- client.cpp \
- testC.cpp \
- testS.cpp \
- test_i.cpp \
- test_i.h
-
-client_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI.la \
- $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.Nested_Event_Loop_Server.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -I$(TAO_ROOT) \
- -I$(TAO_BUILDDIR)
-
-server_SOURCES = \
- server.cpp \
- testC.cpp \
- testS.cpp \
- test_i.cpp \
- test_i.h
-
-server_LDADD = \
- $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
- $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
- $(TAO_BUILDDIR)/tao/libTAO_PI.la \
- $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
- $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
- $(TAO_BUILDDIR)/tao/libTAO.la \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/tests/Nested_Event_Loop/client.cpp b/tests/Nested_Event_Loop/client.cpp
index cda926dccea..4f1a972f14f 100644
--- a/tests/Nested_Event_Loop/client.cpp
+++ b/tests/Nested_Event_Loop/client.cpp
@@ -2,13 +2,10 @@
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
-#include "ace/OS.h"
#include "test_i.h"
#include "tao/Strategies/advanced_resource.h"
-ACE_RCSID(Nested_Event_Loop, client, "$Id$")
-
// Name of file contains ior.
static const ACE_TCHAR *IOR = ACE_TEXT ("file://ior");
diff --git a/tests/Nested_Event_Loop/server.cpp b/tests/Nested_Event_Loop/server.cpp
index baa544c7042..2dbfed5c6fc 100644
--- a/tests/Nested_Event_Loop/server.cpp
+++ b/tests/Nested_Event_Loop/server.cpp
@@ -5,8 +5,6 @@
#include "tao/Strategies/advanced_resource.h"
-ACE_RCSID(Nested_Event_Loop, server, "$Id$")
-
const ACE_TCHAR *ior_output_file = ACE_TEXT("ior");
int
@@ -31,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
-1);
}
- // Indicates sucessful parsing of the command line
+ // Indicates successful parsing of the command line
return 0;
}
diff --git a/tests/Nested_Event_Loop/test_i.cpp b/tests/Nested_Event_Loop/test_i.cpp
index 3703b96ad4e..607f87b5ee1 100644
--- a/tests/Nested_Event_Loop/test_i.cpp
+++ b/tests/Nested_Event_Loop/test_i.cpp
@@ -3,8 +3,6 @@
#include "test_i.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(Nested_Event_Loop, test_i, "$Id$")
-
server_i::server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
{