summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-23 20:12:58 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-04-23 20:12:58 +0000
commitd94def0daec76a4fbf7ae3f7137ab7eacb5b5117 (patch)
tree624c0e62652498eeb1b24e2875e0be2180fab4df
parentdd495b0c91553853022c146fa09bd71bd847a1a1 (diff)
downloadATCD-d94def0daec76a4fbf7ae3f7137ab7eacb5b5117.tar.gz
ChangeLogTag: Wed Apr 23 16:10:07 2003 Irfan Pyarali <irfan@oomworks.com>
-rw-r--r--ChangeLog7
-rw-r--r--ace/config-win32-msvc-6.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 86aa2ee8d89..487d86f9f62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 23 16:10:07 2003 Irfan Pyarali <irfan@oomworks.com>
+
+ * ace\config-win32-msvc-6.h:
+
+ VC 6 does not have support for member templates. Therefore,
+ added #define ACE_LACKS_MEMBER_TEMPLATES to the config file.
+
Wed Apr 23 13:54:27 2003 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/modules/Parser.pm:
diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h
index dfa55c9d311..e2a7996e30b 100644
--- a/ace/config-win32-msvc-6.h
+++ b/ace/config-win32-msvc-6.h
@@ -52,7 +52,8 @@
# define ACE_HAS_TYPENAME_KEYWORD
# define ACE_HAS_USING_KEYWORD
-
+// No support for member templates.
+#define ACE_LACKS_MEMBER_TEMPLATES
#define ACE_HAS_ITOA
@@ -140,6 +141,7 @@
// While digging the MSVC 4.0 include files, I found how to disable
// MSVC warnings: --Amos Shapira
+
// "C4355: 'this' : used in base member initializer list"
# pragma warning(disable:4355) /* disable C4514 warning */
// #pragma warning(default:4355) // use this to reenable, if desired