diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-21 18:34:03 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-10-21 18:34:03 +0000 |
| commit | 7ac9e876a7e9948d83bac5570db7c1f3ee66f417 (patch) | |
| tree | 5a40bf82c89c9496facf74582c935b2e355ac7fd | |
| parent | 7059a47de1e95a65b8ed9e14af961364f3be285a (diff) | |
| download | ATCD-7ac9e876a7e9948d83bac5570db7c1f3ee66f417.tar.gz | |
ChangeLogTag: Tue Oct 21 18:31:52 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/apps/gperf/src/Options.cpp | 16 |
2 files changed, 20 insertions, 6 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1b92a6ca820..381d6a3bd2f 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,13 @@ +Tue Oct 21 18:31:52 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> + + * apps/gperf/src/Options.cpp: + + Moved the instantiation of the static ACE_CString + members to appear before the global class instantiation, + so that the ACE_CString default constructor can in turn + initialize its ACE_Allocator member, needed in the + Options constructor. + Tue Oct 21 17:33:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_stdio.{h,cpp}: diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp index 77a99186d02..be5f8c356c3 100644 --- a/ACE/apps/gperf/src/Options.cpp +++ b/ACE/apps/gperf/src/Options.cpp @@ -35,6 +35,16 @@ ACE_RCSID(src, Options, "$Id$") #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" +// These need to appear before the global class instantiation, since +// they are static members with a default constructor that initializes +// an ACE_Allocator needed in the Options class constructor. +ACE_CString Options::function_name_; +ACE_CString Options::fill_default_; +ACE_CString Options::key_name_; +ACE_CString Options::class_name_; +ACE_CString Options::hash_name_; +ACE_CString Options::delimiters_; + // Global option coordinator for the entire program. Options option; @@ -72,12 +82,6 @@ int Options::initial_asso_value_; int Options::argc_; ACE_TCHAR **Options::argv_; int Options::iterations_; -ACE_CString Options::function_name_; -ACE_CString Options::fill_default_; -ACE_CString Options::key_name_; -ACE_CString Options::class_name_; -ACE_CString Options::hash_name_; -ACE_CString Options::delimiters_; char Options::key_positions_[MAX_KEY_POS]; // Prints program usage to standard error stream. |