summaryrefslogtreecommitdiff
path: root/TAO/examples/Simple
diff options
context:
space:
mode:
authorpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-22 05:23:13 +0000
committerpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-22 05:23:13 +0000
commit6993770b6024708bf5e3ad7d996179bb8450bd06 (patch)
tree0f9431f1f845f9670286d101155b17dc588557a0 /TAO/examples/Simple
parent2094d735403b341525f3a0ac92a97fabd8bcf2dd (diff)
downloadATCD-6993770b6024708bf5e3ad7d996179bb8450bd06.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO/examples/Simple')
-rw-r--r--TAO/examples/Simple/chat/Makefile18
-rw-r--r--TAO/examples/Simple/chat/client.cpp21
-rw-r--r--TAO/examples/Simple/chat/client.h18
3 files changed, 11 insertions, 46 deletions
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index 2df7db5af8e..17f5a752c60 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -15,8 +15,8 @@ IDL_SRC = ReceiverC.cpp ReceiverS.cpp BroadcasterC.cpp BroadcasterS.cpp
PROG_SRCS = \
Receiver_i.cpp \
Broadcaster_i.cpp \
- Chat.cpp \
- Server.cpp
+ client.cpp \
+ server.cpp
SRC = $(IDL_SRC) $(PROG_SRCS)
@@ -27,8 +27,8 @@ SIMPLE_CLT_OBJS = \
BroadcasterC.o \
BroadcasterS.o \
Receiver_i.o \
- Chat_i.o \
- Chat.o
+ Client_i.o \
+ client.o
SIMPLE_SVR_OBJS = \
ReceiverS.o \
@@ -37,10 +37,10 @@ SIMPLE_SVR_OBJS = \
BroadcasterS.o \
Broadcaster_i.o \
Server_i.o \
- Server.o
+ server.o
-BIN = Server \
- Chat
+BIN = server \
+ client
BUILD = $(BIN)
VLDLIBS = $(LDLIBS:%=%$(VAR))
VBIN = $(BIN:%=%$(VAR))
@@ -71,10 +71,10 @@ CPPFLAGS +=
.PRECIOUS: BroadcasterS.cpp BroadcasterS.i BroadcasterS.h
.PRECIOUS: BroadcasterS_T.cpp BroadcasterS_T.i BroadcasterS_T.h
-Server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-Chat: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
realclean: clean
diff --git a/TAO/examples/Simple/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp
index 8b78e9de11f..c56c59759e8 100644
--- a/TAO/examples/Simple/chat/client.cpp
+++ b/TAO/examples/Simple/chat/client.cpp
@@ -16,31 +16,14 @@
//
// ===========================================================
-#include "client_i.h"
+#include "Client_i.h"
int
main (int argc, char *argv[])
{
- char *nick;
-
- if (argc >= 2)
- nick = argv[1];
- else
- ACE_ERROR_RETURN ((LM_ERROR,
- "\n usage: client <nickname>\n"),
- -1);
-
TAO_TRY
{
- ACE_DEBUG ((LM_DEBUG,
- "\n============= Simple Chat ===========\n"));
-
- ACE_DEBUG ((LM_DEBUG,
- "\n============= type 'quit' to exit ===========\n"));
-
- // @@ Please make the "chat.ior" an option or something you can
- // override as a user.
- Client_i client_i ("chat.ior", nick);
+ Client_i client_i;
if (client_i.init (argc, argv) == -1
|| client_i.run () == -1)
diff --git a/TAO/examples/Simple/chat/client.h b/TAO/examples/Simple/chat/client.h
deleted file mode 100644
index d4108612b8d..00000000000
--- a/TAO/examples/Simple/chat/client.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-// ===========================================================
-//
-//
-// = LIBRARY
-// TAO/tests/Simple/chat
-//
-// = FILENAME
-// Chat.h
-//
-// = DESCRIPTION
-// The chat client program class definition.
-//
-// = AUTHOR
-// Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ===========================================================