summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-10-14 15:45:47 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-10-14 15:45:47 +0000
commit255a1959f4c808335d9abc2d7b097258f251f00c (patch)
tree6134c2c40804d364a052040525e0f5d5445ca7a0
parentdcd50fdc12d3133691e073807a88c443406ab615 (diff)
downloadATCD-255a1959f4c808335d9abc2d7b097258f251f00c.tar.gz
ChangeLogTag:Tue Oct 14 10:45:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog_ref19
-rw-r--r--TAO/tests/Blocking_Sync_None/Makefile2
-rw-r--r--TAO/tests/Connection_Timeout/Makefile2
-rw-r--r--TAO/tests/DSI_Gateway/Makefile6
-rw-r--r--TAO/tests/MProfile_Connection_Timeout/Makefile2
-rw-r--r--TAO/tests/MT_Timeout/Makefile2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp2
-rw-r--r--TAO/tests/Nested_Upcall_Crash/Makefile2
-rw-r--r--TAO/tests/Oneway_Buffering/Makefile2
-rw-r--r--TAO/tests/Param_Test/Makefile2
-rw-r--r--TAO/tests/Param_Test/results.h5
-rw-r--r--TAO/tests/Policies/Makefile2
-rw-r--r--TAO/tests/Reliable_Oneways/Makefile2
-rw-r--r--TAO/tests/Timed_Buffered_Oneways/Makefile2
14 files changed, 38 insertions, 14 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 01f2e0cf5d1..e0038f37d89 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,22 @@
+Tue Oct 14 10:45:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tests/Blocking_Sync_None/Makefile:
+ * tests/Connection_Timeout/Makefile:
+ * tests/DSI_Gateway/Makefile:
+ * tests/MProfile_Connection_Timeout/Makefile:
+ * tests/MT_Timeout/Makefile:
+ * tests/Nested_Upcall_Crash/Makefile:
+ * tests/Oneway_Buffering/Makefile:
+ * tests/Param_Test/Makefile:
+ * tests/Policies/Makefile:
+ * tests/Reliable_Oneways/Makefile:
+ * tests/Timed_Buffered_Oneways/Makefile: Added -lTAO_Valuetype to
+ all these Makefiles.
+
+ * tests/Param_Test/results.h:
+ * tests/NestedUpcall/Triangle_Test/initiator.cpp: Fixed
+ compilation problems if native exceptions are turned of.
+
Tue Oct 14 09:45:45 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/Any_Unknown_IDL_Type.h:
diff --git a/TAO/tests/Blocking_Sync_None/Makefile b/TAO/tests/Blocking_Sync_None/Makefile
index 2e428ca03be..f545433d199 100644
--- a/TAO/tests/Blocking_Sync_None/Makefile
+++ b/TAO/tests/Blocking_Sync_None/Makefile
@@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
diff --git a/TAO/tests/Connection_Timeout/Makefile b/TAO/tests/Connection_Timeout/Makefile
index fe953f9d7e7..ef9d383cbc8 100644
--- a/TAO/tests/Connection_Timeout/Makefile
+++ b/TAO/tests/Connection_Timeout/Makefile
@@ -47,7 +47,7 @@ include $(TAO_ROOT)/taoconfig.mk
TAO_MSG_LIBS = -lTAO_Messaging
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_MSG_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_MSG_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
diff --git a/TAO/tests/DSI_Gateway/Makefile b/TAO/tests/DSI_Gateway/Makefile
index ac836e4287a..94d8b62b5d4 100644
--- a/TAO/tests/DSI_Gateway/Makefile
+++ b/TAO/tests/DSI_Gateway/Makefile
@@ -49,13 +49,13 @@ include $(TAO_ROOT)/taoconfig.mk
.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
server: $(addprefix $(VDIR),$(SERVER_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
gateway: $(addprefix $(VDIR),$(GATEWAY_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
diff --git a/TAO/tests/MProfile_Connection_Timeout/Makefile b/TAO/tests/MProfile_Connection_Timeout/Makefile
index 6272f801bc8..72d198f351b 100644
--- a/TAO/tests/MProfile_Connection_Timeout/Makefile
+++ b/TAO/tests/MProfile_Connection_Timeout/Makefile
@@ -46,7 +46,7 @@ include $(TAO_ROOT)/taoconfig.mk
THIS_TEST_LIBS = -lTAO_Messaging -lTAO_IORManip
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ $(THIS_TEST_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(THIS_TEST_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
diff --git a/TAO/tests/MT_Timeout/Makefile b/TAO/tests/MT_Timeout/Makefile
index 47739fed35d..9108aeb73e3 100644
--- a/TAO/tests/MT_Timeout/Makefile
+++ b/TAO/tests/MT_Timeout/Makefile
@@ -51,7 +51,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 41f471855ed..608118538d5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -217,7 +217,7 @@ Initiator_Server::init (int argc,
this->str_ =
this->orb_manager_.activate (this->initiator_i_ptr_
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK;
+ ACE_CHECK_RETURN (-1);
#if 0
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Nested_Upcall_Crash/Makefile b/TAO/tests/Nested_Upcall_Crash/Makefile
index 7060bfbadff..57493444868 100644
--- a/TAO/tests/Nested_Upcall_Crash/Makefile
+++ b/TAO/tests/Nested_Upcall_Crash/Makefile
@@ -53,7 +53,7 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
scavenger: $(addprefix $(VDIR),$(SCAVENGER_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
diff --git a/TAO/tests/Oneway_Buffering/Makefile b/TAO/tests/Oneway_Buffering/Makefile
index 51eeece3c6c..d70fd80addd 100644
--- a/TAO/tests/Oneway_Buffering/Makefile
+++ b/TAO/tests/Oneway_Buffering/Makefile
@@ -56,7 +56,7 @@ admin: $(addprefix $(VDIR),$(ADMIN_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index cd16310ad59..6f243861f05 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -106,7 +106,7 @@ server: $(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(PARAM_TEST_CLT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_DYNAMIC_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
anyop: $(addprefix $(VDIR),$(PARAM_TEST_ANYOP_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_DYNAMIC_LIBS) $(TAO_CLNT_LIBS) $(POSTLINK)
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index 2c3bed51405..e75bf267210 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -28,6 +28,11 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+namespace CORBA
+{
+ class Environment;
+}
+
class Results
{
public:
diff --git a/TAO/tests/Policies/Makefile b/TAO/tests/Policies/Makefile
index e712625d82c..020efeec038 100644
--- a/TAO/tests/Policies/Makefile
+++ b/TAO/tests/Policies/Makefile
@@ -47,7 +47,7 @@ include $(TAO_ROOT)/taoconfig.mk
.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
Manipulation: $(addprefix $(VDIR),$(MANIPULATION_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(VLDLIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(VLDLIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
diff --git a/TAO/tests/Reliable_Oneways/Makefile b/TAO/tests/Reliable_Oneways/Makefile
index f6fae8b2dd7..c33b073fe1b 100644
--- a/TAO/tests/Reliable_Oneways/Makefile
+++ b/TAO/tests/Reliable_Oneways/Makefile
@@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
diff --git a/TAO/tests/Timed_Buffered_Oneways/Makefile b/TAO/tests/Timed_Buffered_Oneways/Makefile
index 957a398a14b..e92b94263b0 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Makefile
+++ b/TAO/tests/Timed_Buffered_Oneways/Makefile
@@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
$(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
client: $(addprefix $(VDIR),$(CLIENT_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK)
+ $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK)
realclean: clean
-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))