summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McQueen <simon.mcqueen@gmail.com>2006-03-27 09:31:06 +0000
committerSimon McQueen <simon.mcqueen@gmail.com>2006-03-27 09:31:06 +0000
commita77b552a723ba8a7a40a1c1b071179c30531a91d (patch)
tree0661ecf3de71acfdb71a6278e4b59a27f61074b3
parent38bc6d0eef7011b6c53eafa399284f4df1123b2e (diff)
downloadATCD-a77b552a723ba8a7a40a1c1b071179c30531a91d.tar.gz
ChangeLogTag: Mon Mar 27 09:18:07 UTC 2006 Simon McQueen <sm@prismtech.com>
-rw-r--r--ChangeLog13
-rw-r--r--ace/Configuration.h4
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e19962fe87f..89603369ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 27 09:18:07 UTC 2006 Simon McQueen <sm@prismtech.com>
+
+ * ace/Configuration.h:
+
+ Remove 'explicit' keyword from a two arg constructor. This is
+ upsetting aCC 331.
+
Mon Mar 27 03:57:38 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
* m4/compiler.m4:
@@ -9,9 +16,9 @@ Mon Mar 27 03:57:38 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Sun Mar 26 21:40:10 2006 Douglas C. Schmidt <schmidt@cse.wustl.edu>
- * ace/TSS_T.cpp: Added patches to silence the type-punning warning
- from G++ 4.x. Thanks to Ken Sedgwick for contributing this
- stuff!
+ * ace/TSS_T.cpp: Added patches to silence the type-punning warning
+ from G++ 4.x. Thanks to Ken Sedgwick for contributing this
+ stuff!
Sun Mar 26 17:29:08 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
diff --git a/ace/Configuration.h b/ace/Configuration.h
index bb1cb11f677..b1ca0f6a9d9 100644
--- a/ace/Configuration.h
+++ b/ace/Configuration.h
@@ -700,8 +700,8 @@ public:
ACE_Configuration_Section_IntId (void);
/// Named ctor
- explicit ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map,
- SUBSECTION_MAP* section_hash_map);
+ ACE_Configuration_Section_IntId (VALUE_MAP* value_hash_map,
+ SUBSECTION_MAP* section_hash_map);
/// Copy ctor
ACE_Configuration_Section_IntId (const ACE_Configuration_Section_IntId& rhs);