diff options
| -rw-r--r-- | ChangeLog-96b | 13 | ||||
| -rw-r--r-- | STL/ChangeLog | 61 | ||||
| -rw-r--r-- | STL/vector.h | 7 | ||||
| -rw-r--r-- | ace/Registry.h | 9 | ||||
| -rw-r--r-- | ace/config-win32-msvc4.0.h | 6 |
5 files changed, 29 insertions, 67 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b index 3b143f4c2f2..da0178ba00e 100644 --- a/ChangeLog-96b +++ b/ChangeLog-96b @@ -1,3 +1,11 @@ +Wed Dec 4 00:27:07 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> + + * ace/Registry: Removed NOMINMAX and + VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flags from the header file. + The VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flag is no longer needed + and NOMINMAX is defined at the project level. Thanks to + Matthias Kerkhoff <make@cs.tu-berlin.de> for suggesting this. + Mon Dec 2 14:13:44 1996 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace: Changed all occurrences of ACE_Event_Handler @@ -69,11 +77,6 @@ Sun Dec 1 19:19:02 1996 Douglas C. Schmidt <schmidt@lambada.cs.wustl.edu> ace/ReactorEx.h from the *.h file to the *.cpp file to avoid problems with circular dependencies. - * ace/ReactorEx: Added a new parameter to the Reactor's - initialization methods so that we can install a subclass of - ACE_Timer_Queue. This is in anticipation of Tim's new - "real-time" implementation of a timer queue. - * ace/Reactor: Added a new parameter to the Reactor's initialization methods so that we can install a subclass of ACE_Timer_Queue. This is in anticipation of Tim's new diff --git a/STL/ChangeLog b/STL/ChangeLog index 902fb94c94c..76c0ec98a8a 100644 --- a/STL/ChangeLog +++ b/STL/ChangeLog @@ -1,53 +1,14 @@ -This version of STL was obtained from -http://www.rahul.net/terris/. This is a modified version of the -implementation that comes with VC++4.0. Please see readme2.stl for -details. +Wed Dec 4 00:17:11 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> -The following modification have been made for compilation with VC++4.x + * vector.h: Modified to remove the default argument to the + constructor. This avoids the VC++4.0 compiler from failing to + deal correctly with nested classes. + + * bstring.h: Modified access to reserve and default_size to + correctly use the std namespace. -________________________________________ + * This version of STL was obtained from + http://www.rahul.net/terris/. This is a modified version of the + implementation that comes with VC++4.0. Please see README + for details. -vector.h (line 85) -________________________________________ - - - /* - * This is cause the VC++ compiler sucks - * and does not recognize nested classes properly - * - */ -#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM) - vector(size_type n, const T& value = T()) { - start = static_allocator.allocate(n); - uninitialized_fill_n(start, n, value); - finish = start + n; - end_of_storage = finish; - } -#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */ - - -________________________________________ - -bstring.h (line 1102) -________________________________________ - - - /* - * This should be correctly scoped - * - * if (cap == ::reserve) - */ - - if (cap == std::reserve) - { - len = 0; - res = size; - ptr = new charT [res]; - } - /* - * This should be correctly scoped - * - * else if ((cap == ::default_size) && (size != NPOS)) - */ - - else if ((cap == std::default_size) && (size != NPOS)) diff --git a/STL/vector.h b/STL/vector.h index 66973a70333..7e2f11448b2 100644 --- a/STL/vector.h +++ b/STL/vector.h @@ -85,16 +85,17 @@ public: /* * This is cause the VC++ compiler sucks * and does not recognize nested classes properly + * + * Here is the original: + * vector(size_type n, const T& value = T()) { * */ -#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM) - vector(size_type n, const T& value = T()) { + vector(size_type n, const T& value /* = T() */) { start = static_allocator.allocate(n); uninitialized_fill_n(start, n, value); finish = start + n; end_of_storage = finish; } -#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */ vector(const vector<T>& x) { start = static_allocator.allocate(x.end() - x.begin()); finish = uninitialized_copy(x.begin(), x.end(), start); diff --git a/ace/Registry.h b/ace/Registry.h index c7ff05a7bec..f21fc0c0fd7 100644 --- a/ace/Registry.h +++ b/ace/Registry.h @@ -17,20 +17,11 @@ #if !defined (ACE_REGISTRY_H) #define ACE_REGISTRY_H -#if !defined (NOMINMAX) -#define NOMINMAX -#define ACE_TURN_NOMINMAX_OFF -#endif - #include "ace/OS.h" #if defined (ACE_WIN32) // This only works on Win32 platforms -#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM) -#define VC_PLUS_PLUS_NESTED_CLASS_PROBLEM -#endif - #include "vector.h" #include "bstring.h" // You must configure the STL components in order to use this wrapper. diff --git a/ace/config-win32-msvc4.0.h b/ace/config-win32-msvc4.0.h index fd4674a094a..3661671180c 100644 --- a/ace/config-win32-msvc4.0.h +++ b/ace/config-win32-msvc4.0.h @@ -7,6 +7,12 @@ #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H +// We are using STL's min and max (in algobase.h). Therefore the +// macros in window.h are extra +#if !defined NOMINMAX +#define NOMINMAX +#endif /* NOMINMAX */ + #if defined (_MSC_VER) // "C4355: 'this' : used in base member initializer list" #pragma warning(disable:4355) // disable C4514 warning |