summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog7
-rw-r--r--include/makeinclude/compiler.bor4
2 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6646e381a9f..d62ea84f63f 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 20 17:01:11 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * examples/Advanced/ch_8_and_10/server.h:
+ Reverted my change of Fri Jan 16 14:16:49 UTC 2004. The problem
+ is the optimizer of BCB6 and replacing strcpy with ::strcpy is
+ not a nice solution
+
Tue Jan 20 11:03:58 2004 Chad Elliott <elliott_c@ociweb.com>
* examples/Advanced/ch_8_and_10/client.cpp:
diff --git a/include/makeinclude/compiler.bor b/include/makeinclude/compiler.bor
index c4989711def..e26d8307fd1 100644
--- a/include/makeinclude/compiler.bor
+++ b/include/makeinclude/compiler.bor
@@ -72,7 +72,11 @@ DEBUG_CFLAGS = -v -y -Od -r- -vi- -k -D_DEBUG -DACE_NO_INLINE=1
DEBUG_LFLAGS = -v
!endif
!else
+!if $(BCBVER) == 6
+DEBUG_CFLAGS = -OS -Ov -Og -DNDEBUG
+!else
DEBUG_CFLAGS = -O2 -DNDEBUG
+!endif
DEBUG_LFLAGS =
!endif