ChangeLogTag:Thu May 4 10:10:38 2000 Carlos O'Ryan <coryan@uci.edu>

11 files changed, 47 insertions, 26 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ac56782df69..8f84fae4655 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,21 +1,44 @@
+Thu May  4 10:10:38 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+	* orbsvcs/tests/AVStreams/Full_Profile/Makefile:
+	* orbsvcs/tests/AVStreams/Latency/Makefile:
+	* orbsvcs/tests/AVStreams/Multicast/Makefile:
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile:
+	* orbsvcs/tests/AVStreams/Pluggable/Makefile:
+	  Add missing libraries to the Makefile, this is only a problem
+	  for static builds, well some platforms have problems with
+	  dynamic libraries too.
+
+	* performance-tests/POA/Demux/Makefile:
+	  More missing libraries.
+
+	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+	  Fixed some more problems with calls to ::feof()
+
+	* utils/catior/catior.cpp:
+	  Print out 1.2 profiles too their format is identical to 1.1
+	  profiles.
+
 Wed May  3 18:31:54 2000  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp: 
-	  Removed a redundant template instantiation
-	
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Pluggable/ftp.cpp: 
-	  Removed the ::feof error
-	
-	* orbsvcs/tests/AVStreams/Latency/pong.cpp: 
-	* orbsvcs/tests/AVStreams/Latency/ping.cpp: 
-	  Added missing template intantiations
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp:
+          Removed a redundant template instantiation
+
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+          Removed the ::feof error
+
+        * orbsvcs/tests/AVStreams/Latency/pong.cpp:
+        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
+          Added missing template intantiations
 
 Wed May  3 16:28:11 2000  Darrell Brunsch  <brunsch@uci.edu>
 
-        * tests/Param_Test/client.dsp:  
+        * tests/Param_Test/client.dsp:
 
           Updated to include the small_union files.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
index 93f0e47b088..c9d7077c3b3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LIBS += -lTAO_AV -lTAO_CosNaming -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 94f7e11f149..d4b7eb10945 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -1,4 +1,4 @@
-2/ $Id$
+// $Id$
 
 #include "ftp.h"
 
@@ -55,7 +55,7 @@ FTP_Client_Callback::handle_timeout (void *)
     }
   if (n == 0)
     {
-      if (ACE_OSCALL_RETURN (::feof (CLIENT::instance ()->file ())))
+      if (feof (CLIENT::instance ()->file ()))
         {
           // wait for sometime for the data to be flushed to the other side.
           this->count_++;
@@ -391,11 +391,9 @@ main (int argc,
 template class ACE_Singleton <Client,ACE_Null_Mutex>;
 template class TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl>;
 template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl>;
-template class TAO_FDev <TAO_FlowProducer, FTP_Server_FlowEndPoint>;
 template class TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl> 
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl> 
-#pragma instantiate TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer> 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
index 37fc7d79ad1..3e2b6e15ea4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile
@@ -6,7 +6,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS = -lTAO_AV -lTAO_CosNaming -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
index c1178248481..22f6860ab3d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LIBS += -lTAO_AV -lTAO_CosNaming -lTAO
+LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 734ddf77530..9c8e94c908e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -62,7 +62,7 @@ FTP_Client_Callback::handle_timeout (void *)
     }
   if (n == 0)
     {
-      if (ACE_OSCALL_RETURN (::feof (CLIENT::instance ()->file ())))
+      if (::feof (CLIENT::instance ()->file ()))
         {
           // wait for sometime for the data to be flushed to the other side.
           this->count_++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
index 6e273a30721..993f452168f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LIBS     += -lTAO_AV -lTAO_CosNaming -lTAO
+LDLIBS    = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index cf30bcda377..1b24ee981f1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -176,7 +176,7 @@ FTP_Client_Callback::handle_timeout (void *)
     }
   if (n == 0)
     {
-      if (ACE_OSCALL_RETURN (feof (CLIENT::instance ()->file ())))
+      if (feof (CLIENT::instance ()->file ()))
         {
           // wait for sometime for the data to be flushed to the other side.
           this->count_++;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
index 71f807b37bb..cfd997f02ba 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile
@@ -9,7 +9,7 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-LIBS     += -lTAO_AV -lTAO_CosNaming -lTAO
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
 
 SERVER_OBJS = server.o
 CLIENT_OBJS = ftp.o
diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile
index 9d8b2f403de..3537cfbc860 100644
--- a/TAO/performance-tests/POA/Demux/Makefile
+++ b/TAO/performance-tests/POA/Demux/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
 #override TAO_IDLFLAGS += \
 #               -H linear_search \
 
-LDLIBS   = -lTAO -lTAO_CosNaming
+LDLIBS   = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
 IDL_FILES = demux_test
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index abc8bd2e3c6..590f8767009 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -642,7 +642,7 @@ cat_profile_helper (TAO_InputCDR& stream,
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
-         && iiop_version_minor <= 1))
+         && iiop_version_minor <= 2))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "%I detected new v%d.%d %s profile",