summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-29 15:18:00 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-12-29 15:18:00 +0000
commit4299ec7bacfdc6aec0a0a58843229d9e8ef9c29d (patch)
treef86f6f68bf8082a63f18619f0847a9c24cf61d84
parent2b4a0cd26d34a8c28a08aa27b03434c4e71f01a9 (diff)
downloadATCD-4299ec7bacfdc6aec0a0a58843229d9e8ef9c29d.tar.gz
ChangeLogTag: Wed Dec 29 09:11:46 1999 David L. Levine <levine@cs.wustl.edu>
-rw-r--r--ChangeLog-99b37
-rw-r--r--ace/config-cxx-common.h5
-rw-r--r--include/makeinclude/platform_linux_cxx.GNU4
3 files changed, 30 insertions, 16 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 3075a203008..3d79d876a22 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,16 +1,31 @@
+Wed Dec 29 09:11:46 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * ace/config-cxx-common.h: enable ACE_USES_OLD_IOSTREAMS
+ without __USE_STD_IOSTREAM. Removed ACE_HAS_STRING_CLASS
+ on Linux, because IOStream_Test won't compile with it.
+
+ * include/makeinclude/platform_linux_cxx.GNU: removed
+ -D__USE_STD_IOSTREAM test, because IOStream_Test failed
+ with it.
+
+ * include/makeinclude/platform_linux_cxx.GNU: Removed
+ -use_ld_input because it has no effect on Linux. Thanks
+ to Ken Block <ptr_corp@ptrsv1.pko.dec.com> for pointing
+ that out.
+
Tue Dec 28 18:32:02 1999 Vishal Kachroo <vishal@cs.wustl.edu>
- * ace/QoS_Session_Impl.cpp: Added a comment for get qos().
-
- * examples/QOS/Receiver_QOS_Event_Handler.cpp:
- * examples/QOS/Receiver_QOS_Event_Handler.h:
- * examples/QOS/server.cpp:
-
- Changed the server of the GQoS example to use the newly added
- QoS classes of ACE. The program structure has changed to reflect
- the abstractness of the ACE QoS API. The final goal is to remove
- all the GQoSisms from the applications, even if this means
- constraining it by the granularity provided by RAPI.
+ * ace/QoS_Session_Impl.cpp: Added a comment for get qos().
+
+ * examples/QOS/Receiver_QOS_Event_Handler.cpp:
+ * examples/QOS/Receiver_QOS_Event_Handler.h:
+ * examples/QOS/server.cpp:
+
+ Changed the server of the GQoS example to use the newly added
+ QoS classes of ACE. The program structure has changed to reflect
+ the abstractness of the ACE QoS API. The final goal is to remove
+ all the GQoSisms from the applications, even if this means
+ constraining it by the granularity provided by RAPI.
Tue Dec 28 15:50:46 1999 David L. Levine <levine@cs.wustl.edu>
diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h
index 120c566a897..6670fd9a8d3 100644
--- a/ace/config-cxx-common.h
+++ b/ace/config-cxx-common.h
@@ -14,9 +14,6 @@
# if defined (linux)
# define ACE_HAS_STANDARD_CPP_LIBRARY 1
# define ACE_HAS_CPLUSPLUS_HEADERS
-# if !defined (__USE_STD_IOSTREAM)
-# define ACE_HAS_STRING_CLASS
-# endif /* ! __USE_STD_IOSTREAM */
# else /* ! linux */
# define ACE_HAS_STRING_CLASS
# if (__DECCXX_VER >= 60090010)
@@ -43,6 +40,8 @@
# define ACE_LACKS_CHAR_RIGHT_SHIFTS
# define ACE_LACKS_IOSTREAM_FX
# define ACE_LACKS_UNBUFFERED_STREAMBUF
+# else /* ! __USE_STD_IOSTREAM */
+# define ACE_USES_OLD_IOSTREAMS
# endif /* ! __USE_STD_IOSTREAM */
// 9: nested comment not allowed. (/usr/include/pdsc.h!) (nestcomment)
diff --git a/include/makeinclude/platform_linux_cxx.GNU b/include/makeinclude/platform_linux_cxx.GNU
index c4a121a3b8e..86c790f6fca 100644
--- a/include/makeinclude/platform_linux_cxx.GNU
+++ b/include/makeinclude/platform_linux_cxx.GNU
@@ -17,7 +17,7 @@ CFLAGS +=
WARNING_FLAGS += -msg_display_number -msg_display_tag
endif # VERBOSE_WARNING
-CCFLAGS += $(CFLAGS) -D__USE_STD_IOSTREAM $(WARNING_FLAGS)
+CCFLAGS += $(CFLAGS) $(WARNING_FLAGS)
ifeq ($(rtti),)
CCFLAGS += -nortti
endif # rtti
@@ -34,7 +34,7 @@ ARFLAGS = rsuv
# When libraries are archived, a hash index is automatically created
# so there is no need for ranlib
RANLIB = @true
-SOFLAGS = -shared -use_ld_input $(ACELIB) cxx_repository/*.o
+SOFLAGS = -shared $(ACELIB) cxx_repository/*.o
SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
ln $(VSHDIR)$*.o $@