summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-10-20 16:36:56 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-10-20 16:36:56 +0000
commitefdb7e6910129a05812896c4d700780baa994552 (patch)
treefc72cf04c563be8f264228d24955498c1f2215cc
parent83cd4fb34d10bed7d4a566547be8b48b16a29b63 (diff)
downloadATCD-efdb7e6910129a05812896c4d700780baa994552.tar.gz
ChangeLogTag:Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
-rw-r--r--ACEXML/common/Makefile.bor1
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLogs/ChangeLog-03a5
-rw-r--r--tests/SPIPE_Test.cpp2
4 files changed, 12 insertions, 1 deletions
diff --git a/ACEXML/common/Makefile.bor b/ACEXML/common/Makefile.bor
index 98975191068..8545b53d384 100644
--- a/ACEXML/common/Makefile.bor
+++ b/ACEXML/common/Makefile.bor
@@ -10,6 +10,7 @@ OBJFILES = \
$(OBJDIR)\DTD_Manager.obj \
$(OBJDIR)\Element_Def_Builder.obj \
$(OBJDIR)\Env.obj \
+ $(OBJDIR)\Encoding.obj \
$(OBJDIR)\Exception.obj \
$(OBJDIR)\FileCharStream.obj \
$(OBJDIR)\InputSource.obj \
diff --git a/ChangeLog b/ChangeLog
index e5b1a5ec70a..c176226090e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of
+ object files. Thanks to Johnny for pointing this out.
+
Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e5b1a5ec70a..c176226090e 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Sun Oct 20 11:31:45 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
+
+ * ACEXML/common/Makefile.bor: Added Encoding.obj to the list of
+ object files. Thanks to Johnny for pointing this out.
+
Sun Oct 20 11:30:04 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* tests/SPIPE_Test.cpp: Fixed compile errors in Borland builds.
diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp
index 0e5e310ea2f..124410a2008 100644
--- a/tests/SPIPE_Test.cpp
+++ b/tests/SPIPE_Test.cpp
@@ -168,7 +168,7 @@ server (void *)
// Verify that we can read the stream of individual bytes all at
// once.
- if (new_stream.recv (buf, sizeof(buf)) != ACE_OS::strlen (ACE_ALPHABET))
+ if (new_stream.recv (buf, sizeof(buf)) != (ssize_t) ACE_OS::strlen (ACE_ALPHABET))
ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n%a"), ACE_TEXT ("recv"), 1));
else
ACE_ASSERT(memcmp(ACE_ALPHABET, buf, ACE_OS::strlen (ACE_ALPHABET)) == 0);