diff options
| -rw-r--r-- | ChangeLog | 42 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 42 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 42 | ||||
| -rw-r--r-- | apps/Gateway/Gateway/Makefile | 2 | ||||
| -rw-r--r-- | apps/Gateway/Peer/Makefile | 2 | ||||
| -rwxr-xr-x | bin/generate_doxygen.pl | 38 | ||||
| -rwxr-xr-x | bin/make_pretty.pl | 3 | ||||
| -rw-r--r-- | etc/ace.doxygen | 2 | ||||
| -rw-r--r-- | etc/ace_man.doxygen | 191 | ||||
| -rw-r--r-- | etc/tao.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_dynamicany.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_dynamicinterface.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_esf.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_iormanip.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_iortable.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_portableserver.doxygen | 2 | ||||
| -rw-r--r-- | etc/tao_rtevent.doxygen | 2 | ||||
| -rw-r--r-- | examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp | 5 | ||||
| -rw-r--r-- | examples/Service_Configurator/IPC-tests/server/Makefile | 2 | ||||
| -rw-r--r-- | examples/Service_Configurator/Misc/Makefile | 2 | ||||
| -rw-r--r-- | examples/Threads/thread_specific.cpp | 2 | ||||
| -rw-r--r-- | examples/Timer_Queue/Makefile | 2 |
22 files changed, 361 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog index 01fdadaf417..83b7605ea29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +Thu Nov 9 17:47:37 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: + Antoher missing Log_Msg.h + + * examples/Threads/thread_specific.cpp: + Tru64 does not like the convertion from ACE_hthread_t to + unsigned long. I'm trying with a reinterpret_cast, but I don't + have much hope for it. + + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + * examples/Timer_Queue/Makefile: + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + Avoid problems where the library is linked twice, once for the + required dependency in parallel builds an another for the LDLIBS + flag. + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + Use a separate file to generate man pages. We don't want to + document .cpp files or include code in man pages, but that looks + great in HTML documents. + + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Update the replacement path to some of the tag files, the + generated documents did not get the right cross references. + + * bin/make_pretty.pl: + Add yet another linker error. + + * bin/generate_doxygen.pl: + Parse the man page generation code to create its output path too. + Thu Nov 9 15:10:28 2000 Carlos O'Ryan <coryan@uci.edu> * bin/make_pretty.pl: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 01fdadaf417..83b7605ea29 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,45 @@ +Thu Nov 9 17:47:37 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: + Antoher missing Log_Msg.h + + * examples/Threads/thread_specific.cpp: + Tru64 does not like the convertion from ACE_hthread_t to + unsigned long. I'm trying with a reinterpret_cast, but I don't + have much hope for it. + + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + * examples/Timer_Queue/Makefile: + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + Avoid problems where the library is linked twice, once for the + required dependency in parallel builds an another for the LDLIBS + flag. + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + Use a separate file to generate man pages. We don't want to + document .cpp files or include code in man pages, but that looks + great in HTML documents. + + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Update the replacement path to some of the tag files, the + generated documents did not get the right cross references. + + * bin/make_pretty.pl: + Add yet another linker error. + + * bin/generate_doxygen.pl: + Parse the man page generation code to create its output path too. + Thu Nov 9 15:10:28 2000 Carlos O'Ryan <coryan@uci.edu> * bin/make_pretty.pl: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 01fdadaf417..83b7605ea29 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,45 @@ +Thu Nov 9 17:47:37 2000 Carlos O'Ryan <coryan@uci.edu> + + * examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp: + Antoher missing Log_Msg.h + + * examples/Threads/thread_specific.cpp: + Tru64 does not like the convertion from ACE_hthread_t to + unsigned long. I'm trying with a reinterpret_cast, but I don't + have much hope for it. + + * examples/Service_Configurator/IPC-tests/server/Makefile: + * examples/Service_Configurator/Misc/Makefile: + * examples/Timer_Queue/Makefile: + * apps/Gateway/Gateway/Makefile: + * apps/Gateway/Peer/Makefile: + Avoid problems where the library is linked twice, once for the + required dependency in parallel builds an another for the LDLIBS + flag. + + * etc/ace.doxygen: + * etc/ace_man.doxygen: + Use a separate file to generate man pages. We don't want to + document .cpp files or include code in man pages, but that looks + great in HTML documents. + + * etc/tao.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtevent.doxygen: + Update the replacement path to some of the tag files, the + generated documents did not get the right cross references. + + * bin/make_pretty.pl: + Add yet another linker error. + + * bin/generate_doxygen.pl: + Parse the man page generation code to create its output path too. + Thu Nov 9 15:10:28 2000 Carlos O'Ryan <coryan@uci.edu> * bin/make_pretty.pl: diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile index b05dad9a955..34c0ed36282 100644 --- a/apps/Gateway/Gateway/Makefile +++ b/apps/Gateway/Gateway/Makefile @@ -24,7 +24,7 @@ FILES = Concrete_Connection_Handlers \ Connection_Handler_Connector LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS = -lGateway +LDLIBS = LIBS += $(ACELIB) diff --git a/apps/Gateway/Peer/Makefile b/apps/Gateway/Peer/Makefile index c9cde0af37c..16852df935a 100644 --- a/apps/Gateway/Peer/Makefile +++ b/apps/Gateway/Peer/Makefile @@ -16,7 +16,7 @@ FILES = Options \ Peer LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS = -lPeer +LDLIBS = LIBS += $(ACELIB) BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) diff --git a/bin/generate_doxygen.pl b/bin/generate_doxygen.pl index 9e594209d93..14370ff8424 100755 --- a/bin/generate_doxygen.pl +++ b/bin/generate_doxygen.pl @@ -13,6 +13,7 @@ require File::Path; $is_release = 0; @ACE_DOCS = ('ace', + 'ace_man', 'ace_rmcast', 'ace_ssl'); @TAO_DOCS = ('tao', @@ -61,7 +62,7 @@ sub generate_doxy_files { my @DOCS = @_; my $VERSION = 'Snapshot ('. - POSIX::strftime("%Y/%m/%d @ %H:%M", localtime) + POSIX::strftime("%Y/%m/%d-%H:%M", localtime) .')'; foreach my $i (@DOCS) { @@ -78,25 +79,39 @@ sub generate_doxy_files { open(DOXYOUTPUT, ">$output") || die "Cannot open doxygen output file $output\n"; - my $output_dir = 'html'; + my $generate_man = 0; + my $generate_html = 0; + my @output_dirs = (); while (<DOXYINPUT>) { chomp; if (/^PROJECT_NUMBER/) { print DOXYOUTPUT "PROJECT_NUMBER = ", $VERSION, "\n"; - } elsif (/^HTML_OUTPUT/) { + next; + } elsif (/^GENERATE_MAN/ && /= YES/) { + $generate_man = 1; + } elsif (/^GENERATE_HTML/ && /= YES/) { + $generate_html = 1; + } elsif ($generate_html && /^HTML_OUTPUT/) { my @field = split(' = '); - $output_dir = $field[1]; - print DOXYOUTPUT $_, "\n"; - } else { - print DOXYOUTPUT $_, "\n"; + if ($#field >= 1) { + push @output_dirs, $field[1]; + } + } elsif ($generate_html && /^MAN_OUTPUT/) { + my @field = split(' = '); + if ($#field >= 1) { + push @output_dirs, $field[1]; + } } + print DOXYOUTPUT $_, "\n"; } close (DOXYOUTPUT); close (DOXYINPUT); - File::Path::mkpath($output_dir, 0, 0755); + foreach my $i (@output_dirs) { + File::Path::mkpath($i, 0, 0755); + } - &run_doxy ($output, $output_dir); + &run_doxy ($output); unlink $output; } @@ -104,7 +119,6 @@ sub generate_doxy_files { sub run_doxy { my $config = shift; - my $output = shift; open(DOX,"doxygen $config 2>&1 |") || die "cannot start ACE doxygen process\n"; while (<DOX>) { @@ -112,10 +126,6 @@ sub run_doxy { } close (DOX) || die "error while running doxygen on $config\n"; - - if (!-d $output) { - die "cannot find output directory <$output> \n"; - } } ######## diff --git a/bin/make_pretty.pl b/bin/make_pretty.pl index 4763c9c9027..9ab6fd5aed7 100755 --- a/bin/make_pretty.pl +++ b/bin/make_pretty.pl @@ -160,7 +160,8 @@ sub is_error () # Look for possible errors return 1 if (/error/i - || /^Fatal\:/); + || /^Fatal\:/ + || /: fatal:/); # didn't find anything return 0; diff --git a/etc/ace.doxygen b/etc/ace.doxygen index 9ba86fbc402..173bba2a020 100644 --- a/etc/ace.doxygen +++ b/etc/ace.doxygen @@ -104,7 +104,7 @@ RTF_STYLESHEET_FILE = # configuration options related to the man page output #--------------------------------------------------------------------------- -GENERATE_MAN = YES +GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 diff --git a/etc/ace_man.doxygen b/etc/ace_man.doxygen new file mode 100644 index 00000000000..ef0f1d80d54 --- /dev/null +++ b/etc/ace_man.doxygen @@ -0,0 +1,191 @@ +# Doxyfile 1.1.5 +# +# $Id$ +# + +PROJECT_NAME = ACE +PROJECT_NUMBER = Snapshot +OUTPUT_DIRECTORY = . +OUTPUT_LANGUAGE = English +DISABLE_INDEX = NO +EXTRACT_ALL = YES +EXTRACT_PRIVATE = YES +EXTRACT_STATIC = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ALWAYS_DETAILED_SEC = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +INTERNAL_DOCS = NO +CLASS_DIAGRAMS = NO +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +VERBATIM_HEADERS = NO +SHOW_INCLUDE_FILES = YES +JAVADOC_AUTOBRIEF = NO +INHERIT_DOCS = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +TAB_SIZE = 8 +ENABLED_SECTIONS = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +QUIET = YES +WARNINGS = NO +WARN_IF_UNDOCUMENTED = NO +WARN_FORMAT = "$file:$line: $text" + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +INPUT = ace +FILE_PATTERNS = *.h +RECURSIVE = NO +EXCLUDE = ace/config.h +EXCLUDE_PATTERNS = config-*.h +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +IMAGE_PATH = +INPUT_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 1 +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +GENERATE_HTML = NO +HTML_OUTPUT = +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +LATEX_BATCHMODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +GENERATE_MAN = YES +MAN_OUTPUT = doxygen_man +MAN_EXTENSION = .3 + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES +SEARCH_INCLUDES = YES +INCLUDE_PATH = . +PREDEFINED = +EXPAND_AS_DEFINED = ACE_RCSID \ + ACE_UNIMPLEMENTED_FUNC + +#--------------------------------------------------------------------------- +# Configuration::addtions related to external references +#--------------------------------------------------------------------------- + +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz + +HAVE_DOT = NO +CLASS_GRAPH = NO +COLLABORATION_GRAPH = NO +INCLUDE_GRAPH = NO +INCLUDED_BY_GRAPH = NO +GRAPHICAL_HIERARCHY = NO +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found on the path. +DOT_PATH = /usr/local/bin +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 + +#--------------------------------------------------------------------------- +# Configuration::addtions related to the search engine +#--------------------------------------------------------------------------- + +SEARCHENGINE = NO + +# The CGI_NAME tag should be the name of the CGI script that +# starts the search engine (doxysearch) with the correct parameters. +# A script with this name will be generated by doxygen. + +CGI_NAME = search.cgi + +# The CGI_URL tag should be the absolute URL to the directory where the +# cgi binaries are located. See the documentation of your http daemon for +# details. + +CGI_URL = http://doc.ece.uci.edu/cgi-bin/ + +# The DOC_URL tag should be the absolute URL to the directory where the +# documentation is located. If left blank the absolute path to the +# documentation, with file:// prepended to it, will be used. + +DOC_URL = http://doc.ece.uci.edu/Doxygen/Current/ + +# The DOC_ABSPATH tag should be the absolute path to the directory where the +# documentation is located. If left blank the directory on the local machine +# will be used. + +DOC_ABSPATH = /project/doctmp/Doxygen/Current + +# The BIN_ABSPATH tag must point to the directory where the doxysearch binary +# is installed. + +BIN_ABSPATH = /usr/bin + +# The EXT_DOC_PATHS tag can be used to specify one or more paths to +# documentation generated for other projects. This allows doxysearch to search +# the documentation for these projects as well. + +EXT_DOC_PATHS = diff --git a/etc/tao.doxygen b/etc/tao.doxygen index ff78bab78fc..56b44814fbb 100644 --- a/etc/tao.doxygen +++ b/etc/tao.doxygen @@ -130,7 +130,7 @@ EXPAND_AS_DEFINED = ACE_RCSID # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace +TAGFILES = html/ace/ACE.tag=../../ace GENERATE_TAGFILE = html/tao/TAO.tag ALLEXTERNALS = NO PERL_PATH = /usr/bin/perl diff --git a/etc/tao_dynamicany.doxygen b/etc/tao_dynamicany.doxygen index 7a08f6580ee..a3dcfcccbb3 100644 --- a/etc/tao_dynamicany.doxygen +++ b/etc/tao_dynamicany.doxygen @@ -131,7 +131,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace html/tao/TAO.tag=.. +TAGFILES = html/ace/ACE.tag=../../ace html/tao/TAO.tag=.. GENERATE_TAGFILE = html/tao/dynamicany/TAO_DynamicAny.tag ALLEXTERNALS = NO PERL_PATH = /usr/bin/perl diff --git a/etc/tao_dynamicinterface.doxygen b/etc/tao_dynamicinterface.doxygen index 3f16a03335e..08450d02e60 100644 --- a/etc/tao_dynamicinterface.doxygen +++ b/etc/tao_dynamicinterface.doxygen @@ -131,7 +131,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace html/tao/TAO.tag=.. +TAGFILES = html/ace/ACE.tag=../../ace html/tao/TAO.tag=.. GENERATE_TAGFILE = html/tao/dynamicinterface/TAO_DynamicInterface.tag ALLEXTERNALS = NO PERL_PATH = /usr/bin/perl diff --git a/etc/tao_esf.doxygen b/etc/tao_esf.doxygen index 4869fef032d..f8cf822610d 100644 --- a/etc/tao_esf.doxygen +++ b/etc/tao_esf.doxygen @@ -131,7 +131,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace \ +TAGFILES = html/ace/ACE.tag=../../ace \ html/tao/TAO.tag=.. \ html/tao/portableserver/TAO_PortableServer.tag=../portableserver GENERATE_TAGFILE = html/tao/esf/TAO_ESF.tag diff --git a/etc/tao_iormanip.doxygen b/etc/tao_iormanip.doxygen index b50c1bfddf8..5da4597da8c 100644 --- a/etc/tao_iormanip.doxygen +++ b/etc/tao_iormanip.doxygen @@ -131,7 +131,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace \ +TAGFILES = html/ace/ACE.tag=../../ace \ html/tao/TAO.tag=.. GENERATE_TAGFILE = html/tao/iormanipulation/TAO_IORManipulation.tag ALLEXTERNALS = NO diff --git a/etc/tao_iortable.doxygen b/etc/tao_iortable.doxygen index 348547facd6..472dd78c3b4 100644 --- a/etc/tao_iortable.doxygen +++ b/etc/tao_iortable.doxygen @@ -131,7 +131,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace \ +TAGFILES = html/ace/ACE.tag=../../ace \ html/tao/TAO.tag=.. GENERATE_TAGFILE = html/tao/iortable/TAO_IORTable.tag ALLEXTERNALS = NO diff --git a/etc/tao_portableserver.doxygen b/etc/tao_portableserver.doxygen index dde15d46997..40dea0964a6 100644 --- a/etc/tao_portableserver.doxygen +++ b/etc/tao_portableserver.doxygen @@ -131,7 +131,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace \ +TAGFILES = html/ace/ACE.tag=../../ace \ html/tao/TAO.tag=.. GENERATE_TAGFILE = html/tao/portableserver/TAO_PortableServer.tag ALLEXTERNALS = NO diff --git a/etc/tao_rtevent.doxygen b/etc/tao_rtevent.doxygen index 8f32bf7c038..865a8ad2efa 100644 --- a/etc/tao_rtevent.doxygen +++ b/etc/tao_rtevent.doxygen @@ -139,7 +139,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \ # Configuration::addtions related to external references #--------------------------------------------------------------------------- -TAGFILES = html/ace/ACE.tag=../ace \ +TAGFILES = html/ace/ACE.tag=../../ace \ html/tao/TAO.tag=.. \ html/tao/portableserver/TAO_PortableServer.tag=../portableserver \ html/tao/esf/TAO_ESF.tag=../esf diff --git a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp index 5f52e3159db..da0adacd691 100644 --- a/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp +++ b/examples/IPC_SAP/SPIPE_SAP/producer_msg.cpp @@ -2,6 +2,7 @@ #include "ace/SPIPE_Addr.h" #include "ace/SPIPE_Connector.h" +#include "ace/Log_Msg.h" ACE_RCSID(SPIPE_SAP, producer_msg, "$Id$") @@ -12,7 +13,7 @@ ACE_RCSID(SPIPE_SAP, producer_msg, "$Id$") const int DEFAULT_SIZE = 4 * 1024; const int DEFAULT_COUNT = 100; -int +int main (int argc, char *argv[]) { int size = argc > 1 ? atoi (argv[1]) : DEFAULT_SIZE; @@ -37,7 +38,7 @@ main (int argc, char *argv[]) ACE_Str_Buf buffer (buf, size); for (i = 0; i < iterations; i++) - if (cli_stream.send ((ACE_Str_Buf *) 0, + if (cli_stream.send ((ACE_Str_Buf *) 0, &buffer, 1, MSG_BAND) == -1) diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile index 6278253914f..e9a6dd29a23 100644 --- a/examples/Service_Configurator/IPC-tests/server/Makefile +++ b/examples/Service_Configurator/IPC-tests/server/Makefile @@ -27,7 +27,7 @@ FILES = Handle_L_Dgram \ PSRC = $(addsuffix .cpp,$(BIN)) LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS += -lServer +LDLIBS += LIBS += $(ACELIB) BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile index 8d794b60e14..7fbcde8898d 100644 --- a/examples/Service_Configurator/Misc/Makefile +++ b/examples/Service_Configurator/Misc/Makefile @@ -18,7 +18,7 @@ FILES = Timer_Service PSRC = $(addsuffix .cpp,$(BIN)) LSRC = $(addsuffix .cpp,$(FILES)) -LDLIBS = -lTimer +LDLIBS = LIBS += $(ACELIB) diff --git a/examples/Threads/thread_specific.cpp b/examples/Threads/thread_specific.cpp index 54397282388..c2eaf85b1b6 100644 --- a/examples/Threads/thread_specific.cpp +++ b/examples/Threads/thread_specific.cpp @@ -121,7 +121,7 @@ worker (void *c) ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, printf_lock, 0); ACE_OS::printf ("(%lu) errno = %d, lineno = %d, flags = %d\n", - ACE_static_cast(unsigned long,handle), + ACE_reinterpret_cast(unsigned long,handle), tss_error->error (), tss_error->line (), tss_error->flags ()); diff --git a/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile index 49b34955450..53786d8b44c 100644 --- a/examples/Timer_Queue/Makefile +++ b/examples/Timer_Queue/Makefile @@ -22,7 +22,7 @@ LSRC = Async_Timer_Queue_Test.cpp \ Thread_Timer_Queue_Test.cpp \ Driver.cpp -LDLIBS = -lTQTD +LDLIBS = LIBS += $(ACELIB) |