summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE-INSTALL.html32
-rw-r--r--ChangeLog14
-rw-r--r--ChangeLogs/ChangeLog-02a14
-rw-r--r--ChangeLogs/ChangeLog-03a14
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a17
-rw-r--r--TAO/examples/Simple/time-date/time_date.bor4
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.bor4
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/Makefile.bor8
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/client.bor44
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server.bor45
-rw-r--r--TAO/orbsvcs/tests/Makefile.bor2
-rw-r--r--TAO/orbsvcs/tests/Time/client.bor4
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/client.bor4
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/server.bor4
-rw-r--r--ace/Future.h2
-rw-r--r--ace/Service_Config.cpp6
-rw-r--r--ace/Service_Config.h4
-rw-r--r--ace/Test_and_Set.h2
18 files changed, 190 insertions, 34 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 407c18523ae..831e26a119c 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -116,7 +116,7 @@ For information on TAO's platform coverage and support, please also see
<td>Responsible for continued maintenance and testing of platforms
to which ACE has been ported, but aren't supported by the
above groups. These include
- Windows 95/98/CE using Borland C++ Builder 4.0, IBM VisualAge C++,
+ Windows 95/98/CE using Borland C++ Builder 4.0 and later, IBM VisualAge C++,
and GNU g++ on MinGW;
Digital UNIX (Compaq Tru64) 4.0 and 5.0;
IRIX 6.x; UnixWare 7.1.0; SunOS 4.x and Solaris with SunC++ 4.x;
@@ -168,7 +168,7 @@ supported by the DOC group, Riverace, or OCI. <P>
We've also added some support for
<A HREF="#mingw">GNU g++ with Mingw</A>,
- Borland C++ Builder 4.0 and IBM's VisualAge C++ compiler.
+ Borland C++ Builder 4.0/5.0 and IBM's VisualAge C++ compiler.
Since we don't have these compilers we rely on the ACE+TAO users
community to maintain these ports. Therefore, please send email
to the ACE mailing list if you run into problems. <P>
@@ -765,7 +765,7 @@ make: *** [libACE.so] Error 8
The Mac OS X port of ACE is very much a work in progress. Some
of the examples build and run, some of them don't yet. Reactors
seem to work, while Proactors don't (Mac OS X doesn't use aio_*
- calls for async i/o, it uses the OS X Event Queue instead, and
+ calls for async i/o, it uses the OS X Event Queue instead, and
the ACE port doesn't take this into account yet). Also, on OS X,
you must set the DYLD_LIBRARY_PATH environment variable to
$ACE_ROOT/ace i.e. setenv DYLD_LIBRARY_PATH $ACE_ROOT/ace, or else
@@ -777,7 +777,7 @@ a work project, and basically only ported enough of ACE to be able to
do what we needed to with it on Mac OS X. If you would like
to continue the port, please contact John since he as
interested in seeing ACE run, lean, mean and fully supported,
- on Mac OS X.
+ on Mac OS X.
</UL>
@@ -1200,7 +1200,7 @@ ACE contains project files for Microsoft Visual C++ 5.0 or later
Makefile.bor files to compile ACE, the ACE one-button tests, and TAO
with Borland C++ Builder. <P>
-The Borland C++ Builder 4.0 port has been done by <A
+The Borland C++ Builder 4.0/5.0 port has been done by <A
HREF="mailto:jody@atdesk.com">Jody Hagins</A> and <A
HREF="mailto:chris@kohlhoff.com">Christopher Kohlhoff</A>. By
default, the ACE/TAO libraries built for Borland C++ Builder are
@@ -1589,7 +1589,7 @@ The steps we followed in the build are:
% make static_libs=1
</pre></code></blockquote>
-
+
<LI> <A NAME="mingwrunpath">
The same rules for Win32 search of DLLs apply for Mingw. If you
want to run some ACE programs from the cygwin shell, you may
@@ -1599,7 +1599,7 @@ The steps we followed in the build are:
# export PATH=//c/work/mingw/ACE_wrappers/ace:$PATH
</pre></code></blockquote>
-
+
</OL>
<B>ACE TESTS</B><P>
@@ -1614,7 +1614,7 @@ make:
</pre></code></blockquote>
<p>
-Once you build all the tests, you can run
+Once you build all the tests, you can run
<code>run_tests.sh</code> in the
<code>tests</code> directory to try all the tests:
@@ -2210,10 +2210,10 @@ Here's what you need to do:<P>
<CODE>
export RTEMS_MAKEFILE_PATH=/opt/rtems/CPU-rtems/BSP
# setup the build structure
-cd ACE_wrappers
+cd ACE_wrappers
# create the host (e.g. Linux in this case) build tree
-./bin/create_ace_build Linux_g++
+./bin/create_ace_build Linux_g++
cd build/Linux_g++/ace
ln -s ../../../ace/config-linux.h config.h
cd ../include/makeinclude/
@@ -2221,9 +2221,9 @@ ln -s ../../../../include/makeinclude/platform_linux.GNU platform_macros.GNU
cd ../../../..
# create the target build tree
-./bin/create_ace_build rtems
-cd build/rtems/TAO
-/bin/rm -r TAO_IDL
+./bin/create_ace_build rtems
+cd build/rtems/TAO
+/bin/rm -r TAO_IDL
ln -s ../../Linux_g++/TAO/TAO_IDL .
cd ../ace
ln -s ../../../ace/config-rtems.h config.h
@@ -2232,8 +2232,8 @@ ln -s ../../../../include/makeinclude/platform_rtems.x_g++.GNU platform_macros.G
cd ../../../..
# build the host side of things
-cd build/Linux_g++
-export ACE_ROOT=`pwd`; export LD_LIBRARY_PATH=`pwd`/ace:$LD_LIBRARY_PATH
+cd build/Linux_g++
+export ACE_ROOT=`pwd`; export LD_LIBRARY_PATH=`pwd`/ace:$LD_LIBRARY_PATH
cd ace
make
@@ -2245,7 +2245,7 @@ cd ../TAO
make
# build the target side of things
-cd ../rtems
+cd ../rtems
export ACE_ROOT=`pwd`
cd ace
make
diff --git a/ChangeLog b/ChangeLog
index 0f5ffd8ec44..432d6eb2285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Sep 19 12:00:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ACE-INSTALL.html:
+ Added BCB5 to some places as supported/used compiler
+
+ * ace/Future.h:
+ * ace/Test_and_Set.h:
+ Removed the ACE_EXPORT from the templates ACE_Future_Holder and
+ ACE_Test_and_Set
+
+ * ace/Service_Config.{h,cpp}:
+ Changed the type of the members be_a_daemon_ and no_static_svcs_
+ from char to int
+
Tue Sep 18 13:57:36 2001 Carlos O'Ryan <coryan@uci.edu>
* */Makefile:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0f5ffd8ec44..432d6eb2285 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Wed Sep 19 12:00:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ACE-INSTALL.html:
+ Added BCB5 to some places as supported/used compiler
+
+ * ace/Future.h:
+ * ace/Test_and_Set.h:
+ Removed the ACE_EXPORT from the templates ACE_Future_Holder and
+ ACE_Test_and_Set
+
+ * ace/Service_Config.{h,cpp}:
+ Changed the type of the members be_a_daemon_ and no_static_svcs_
+ from char to int
+
Tue Sep 18 13:57:36 2001 Carlos O'Ryan <coryan@uci.edu>
* */Makefile:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0f5ffd8ec44..432d6eb2285 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,17 @@
+Wed Sep 19 12:00:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ACE-INSTALL.html:
+ Added BCB5 to some places as supported/used compiler
+
+ * ace/Future.h:
+ * ace/Test_and_Set.h:
+ Removed the ACE_EXPORT from the templates ACE_Future_Holder and
+ ACE_Test_and_Set
+
+ * ace/Service_Config.{h,cpp}:
+ Changed the type of the members be_a_daemon_ and no_static_svcs_
+ from char to int
+
Tue Sep 18 13:57:36 2001 Carlos O'Ryan <coryan@uci.edu>
* */Makefile:
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 5a6f502bec6..0ddfb829c92 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Wed Sep 19 12:06:04 2001 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Simple/time-date/time-date.bor:
+ * orbsvcs/tests/Concurrency/CC_client.bor:
+ * orbsvcs/tests/Time/client.bor:
+ * orbsvcs/tests/ior_corbaname/client.bor:
+ * orbsvcs/tests/ior_corbaname/server.bor:
+ Corrected the SVCUTILS to SVC_UTILS
+
+ * orbsvcs/tests/IOR_MCast
+ Added BCB makefiles
+
+ * orbsvcs/tests/Makefile.bor
+ Added IOR_MCast and missing LoadBalancing
+
Wed Sep 19 02:58:46 2001 Irfan Pyarali <irfan@cs.wustl.edu>
* orbsvcs/orbsvcs/Makefile.av (.obj/Transport.o): Fixed minor
@@ -17,7 +32,7 @@ Tue Sep 18 15:55:18 2001 Irfan Pyarali <irfan@cs.wustl.edu>
* tests/TAO_Tests.dsw: Added Cache_Growth_Test and
Exposed_Policies.
-
+
* tests/Cache_Growth_Test/Hello.cpp (get_string): transport_cache
is now in the lane resources.
diff --git a/TAO/examples/Simple/time-date/time_date.bor b/TAO/examples/Simple/time-date/time_date.bor
index c241f55bb78..994579a3947 100644
--- a/TAO/examples/Simple/time-date/time_date.bor
+++ b/TAO/examples/Simple/time-date/time_date.bor
@@ -18,7 +18,7 @@ CFLAGS = \
$(ACE_CFLAGS) \
$(TAO_CFLAGS) \
$(TAO_COSNAMING_CFLAGS) \
- $(TAO_SVCUTILS_CFLAGS) \
+ $(TAO_SVC_UTILS_CFLAGS) \
$(TAO_IORTABLE_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS)
@@ -26,7 +26,7 @@ LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
$(TAO_COSNAMING_LIB) \
- $(TAO_SVCUTILS_LIB) \
+ $(TAO_SVC_UTILS_LIB) \
$(TAO_IORTABLE_LIB) \
$(TAO_PORTABLESERVER_LIB)
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.bor b/TAO/orbsvcs/tests/Concurrency/CC_client.bor
index ea714826946..707e03a0435 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.bor
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.bor
@@ -21,7 +21,7 @@ CFLAGS = \
$(TAO_IORTABLE_CFLAGS) \
$(TAO_NAMING_CFLAGS) \
$(TAO_CONCURRENCY_CFLAGS) \
- $(TAO_SVCUTILS_CFLAGS)
+ $(TAO_SVC_UTILS_CFLAGS)
LIBFILES = \
$(ACE_LIB) \
@@ -30,7 +30,7 @@ LIBFILES = \
$(TAO_IORTABLE_LIB) \
$(TAO_NAMING_LIB) \
$(TAO_CONCURRENCY_LIB) \
- $(TAO_SVCUTILS_LIB)
+ $(TAO_SVC_UTILS_LIB)
CPPDIR = .;..
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.bor b/TAO/orbsvcs/tests/IOR_MCast/Makefile.bor
new file mode 100644
index 00000000000..5f4ec02045b
--- /dev/null
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.bor
@@ -0,0 +1,8 @@
+#
+# Makefile for building the IOR_MCast test
+#
+
+MAKEFILES = client.bor server.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
+
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.bor b/TAO/orbsvcs/tests/IOR_MCast/client.bor
new file mode 100644
index 00000000000..90b1e231dc2
--- /dev/null
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.bor
@@ -0,0 +1,44 @@
+#
+# Makefile for building the IOR_MCast test
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+ $(OBJDIR)\MCastC.obj \
+ $(OBJDIR)\MCastS.obj \
+ $(OBJDIR)\ior_mcast_client_i.obj \
+ $(OBJDIR)\client.obj
+
+CFLAGS = \
+ $(ACE_CFLAGS) \
+ $(TAO_CFLAGS) \
+ $(TAO_PORTABLESERVER_CFLAGS) \
+ $(TAO_NAMING_CFLAGS) \
+ $(TAO_SVC_UTILS_CFLAGS)
+
+LIBFILES = \
+ $(ACE_LIB) \
+ $(TAO_LIB) \
+ $(TAO_PORTABLESERVER_LIB) \
+ $(TAO_NAMING_LIB) \
+ $(TAO_SVC_UTILS_LIB)
+
+IDLFILES = \
+ $(IDLDIR)\MCast.idl
+
+CPPDIR = .;..
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\MCastC.cpp $(IDLDIR)\MCastS.cpp: $(IDLDIR)\MCast.idl
+ $(TAO_IDL) $**
+
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.bor b/TAO/orbsvcs/tests/IOR_MCast/server.bor
new file mode 100644
index 00000000000..e4b9977cc59
--- /dev/null
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.bor
@@ -0,0 +1,45 @@
+#
+# Makefile for building the IOR_MCast test
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+ $(OBJDIR)\MCastC.obj \
+ $(OBJDIR)\MCastS.obj \
+ $(OBJDIR)\MCast_Server_i.obj \
+ $(OBJDIR)\server_i.obj \
+ $(OBJDIR)\server.obj
+
+IDLFILES = \
+ $(IDLDIR)\MCast.idl
+
+CFLAGS = \
+ $(ACE_CFLAGS) \
+ $(TAO_CFLAGS) \
+ $(TAO_PORTABLESERVER_CFLAGS) \
+ $(TAO_NAMING_CFLAGS) \
+ $(TAO_SVC_UTILS_CFLAGS)
+
+LIBFILES = \
+ $(ACE_LIB) \
+ $(TAO_LIB) \
+ $(TAO_PORTABLESERVER_LIB) \
+ $(TAO_NAMING_LIB) \
+ $(TAO_SVC_UTILS_LIB)
+
+CPPDIR = .;..
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\MCastC.cpp $(IDLDIR)\MCastS.cpp: $(IDLDIR)\MCast.idl
+ $(TAO_IDL) $**
+
diff --git a/TAO/orbsvcs/tests/Makefile.bor b/TAO/orbsvcs/tests/Makefile.bor
index 280400ca1b8..406a4ad8a70 100644
--- a/TAO/orbsvcs/tests/Makefile.bor
+++ b/TAO/orbsvcs/tests/Makefile.bor
@@ -15,6 +15,8 @@ DIRS = \
EC_Custom_Marshal \
Event_Latency \
ior_corbaname \
+ IOR_MCast \
+ LoadBalancing \
Property \
Simple_Naming \
Time \
diff --git a/TAO/orbsvcs/tests/Time/client.bor b/TAO/orbsvcs/tests/Time/client.bor
index 214be61309d..4328dc7a9c6 100644
--- a/TAO/orbsvcs/tests/Time/client.bor
+++ b/TAO/orbsvcs/tests/Time/client.bor
@@ -15,7 +15,7 @@ CFLAGS = \
$(TAO_IORTABLE_CFLAGS) \
$(TAO_NAMING_CFLAGS) \
$(TAO_TIME_CFLAGS) \
- $(TAO_SVCUTILS_CFLAGS)
+ $(TAO_SVC_UTILS_CFLAGS)
LIBFILES = \
$(ACE_LIB) \
@@ -24,7 +24,7 @@ LIBFILES = \
$(TAO_IORTABLE_LIB) \
$(TAO_NAMING_LIB) \
$(TAO_TIME_LIB) \
- $(TAO_SVCUTILS_LIB)
+ $(TAO_SVC_UTILS_LIB)
CPPDIR = .;..
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.bor b/TAO/orbsvcs/tests/ior_corbaname/client.bor
index 8839c1d4c0f..c1d66cd34a2 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.bor
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.bor
@@ -18,14 +18,14 @@ CFLAGS = \
$(TAO_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS) \
$(TAO_NAMING_CFLAGS) \
- $(TAO_SVCUTILS_CFLAGS)
+ $(TAO_SVC_UTILS_CFLAGS)
LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
$(TAO_PORTABLESERVER_LIB) \
$(TAO_NAMING_LIB) \
- $(TAO_SVCUTILS_LIB)
+ $(TAO_SVC_UTILS_LIB)
IDLFILES = \
$(IDLDIR)\corbaname.idl
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.bor b/TAO/orbsvcs/tests/ior_corbaname/server.bor
index a9cb02e5e68..48aa9ddec78 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.bor
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.bor
@@ -20,14 +20,14 @@ CFLAGS = \
$(TAO_CFLAGS) \
$(TAO_PORTABLESERVER_CFLAGS) \
$(TAO_NAMING_CFLAGS) \
- $(TAO_SVCUTILS_CFLAGS)
+ $(TAO_SVC_UTILS_CFLAGS)
LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
$(TAO_PORTABLESERVER_LIB) \
$(TAO_NAMING_LIB) \
- $(TAO_SVCUTILS_LIB)
+ $(TAO_SVC_UTILS_LIB)
CPPDIR = .;..
diff --git a/ace/Future.h b/ace/Future.h
index 594a3a451f7..4d5da0f034a 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -40,7 +40,7 @@ template <class T> class ACE_Future;
* @brief Implementation of object which has holds ACE_Future.
*/
template <class T>
-class ACE_Export ACE_Future_Holder
+class ACE_Future_Holder
{
public:
ACE_Future_Holder (const ACE_Future<T> &future);
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 51ce466701e..4a4ac75afaa 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -48,8 +48,8 @@ ACE_Sig_Adapter *ACE_Service_Config::signal_handler_ = 0;
sig_atomic_t ACE_Service_Config::reconfig_occurred_ = 0;
// = Set by command-line options.
-char ACE_Service_Config::be_a_daemon_ = 0;
-char ACE_Service_Config::no_static_svcs_ = 1;
+int ACE_Service_Config::be_a_daemon_ = 0;
+int ACE_Service_Config::no_static_svcs_ = 1;
// Number of the signal used to trigger reconfiguration.
int ACE_Service_Config::signum_ = SIGHUP;
@@ -186,7 +186,7 @@ ACE_Service_Config::ACE_Service_Config (int ignore_static_svcs,
int signum)
{
ACE_TRACE ("ACE_Service_Config::ACE_Service_Config");
- ACE_Service_Config::no_static_svcs_ = (char) ignore_static_svcs;
+ ACE_Service_Config::no_static_svcs_ = ignore_static_svcs;
ACE_Service_Config::signum_ = signum;
// Initialize the Service Repository.
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index 5e207e13d00..cbdeb9fa4b4 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -483,10 +483,10 @@ private:
// = Set by command-line options.
/// Shall we become a daemon process?
- static char be_a_daemon_;
+ static int be_a_daemon_;
/// Should we avoid loading the static services?
- static char no_static_svcs_;
+ static int no_static_svcs_;
/// Number of the signal used to trigger reconfiguration.
static int signum_;
diff --git a/ace/Test_and_Set.h b/ace/Test_and_Set.h
index 83bb57e329d..4def53af1bd 100644
--- a/ace/Test_and_Set.h
+++ b/ace/Test_and_Set.h
@@ -34,7 +34,7 @@
* value 0 or 1.
*/
template <class ACE_LOCK, class TYPE>
-class ACE_Export ACE_Test_and_Set : public ACE_Event_Handler
+class ACE_Test_and_Set : public ACE_Event_Handler
{
public:
ACE_Test_and_Set (TYPE initial_value = 0);
View Lorry Controller Status