diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-04 09:41:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-04 09:41:32 +0000 |
| commit | 5e3f201fc357e8730cc2c2fb7da905b3d0a86ad3 (patch) | |
| tree | eeaea73e2bff5f9181b74bd7f1c055ce92a65730 | |
| parent | d62bdd4e60a2d7435ba37a528dd3e5244a65559e (diff) | |
| download | ATCD-5e3f201fc357e8730cc2c2fb7da905b3d0a86ad3.tar.gz | |
Thu Jun 4 09:42:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* contrib/FaCE/CE_ARGV.h:
* contrib/FaCE/FaCE.cpp:
Fixed GCC 4.4 warnings
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/contrib/FaCE/CE_ARGV.h | 4 | ||||
| -rw-r--r-- | ACE/contrib/FaCE/FaCE.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index b231cb6555c..ca9fbdb58c7 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 4 09:42:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * contrib/FaCE/CE_ARGV.h: + * contrib/FaCE/FaCE.cpp: + Fixed GCC 4.4 warnings + Thu Jun 4 09:12:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS_NS_stdio.h: diff --git a/ACE/contrib/FaCE/CE_ARGV.h b/ACE/contrib/FaCE/CE_ARGV.h index abd6e8416b7..a4cf2b1aaad 100644 --- a/ACE/contrib/FaCE/CE_ARGV.h +++ b/ACE/contrib/FaCE/CE_ARGV.h @@ -52,7 +52,7 @@ public: /** * Returns the 'char**' that contains the converted command line parameters. */ - wchar_t** const argv(void); + wchar_t** argv(void); private: /** @@ -83,7 +83,7 @@ inline int CE_ARGV::argc() } -inline wchar_t** const CE_ARGV::argv() +inline wchar_t** CE_ARGV::argv() { return ce_argv_; } diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp index 94e41353156..b1d61ec0796 100644 --- a/ACE/contrib/FaCE/FaCE.cpp +++ b/ACE/contrib/FaCE/FaCE.cpp @@ -21,7 +21,7 @@ // This utility does not use ACE, and shouldn't. //FUZZ: disable check_for_lack_ACE_OS -ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); +const ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); /** * This simple and small class manages user-input command line @@ -459,7 +459,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM) { SHINITDLGINFO shidi; - ACE_TCHAR* copyrightNote = + const ACE_TCHAR* copyrightNote = ACE_TEXT("ACE and TAO are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object") \ ACE_TEXT("Computing at Washington University, 1993-2002, all rights reserved.") \ ACE_TEXT("FaCE is copyrighted by Object Computing, Inc., 2002,\n all rights reserved.\n") \ |