diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-08-05 09:41:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-08-05 09:41:11 +0000 |
| commit | 8deb4b821088770ec3509f0dc04526cf882c8647 (patch) | |
| tree | 6ee5260c60be50471cf655f942ac74b2fa26df12 | |
| parent | f2f8a46765a850d444a15b9d66b4991675b7fc6e (diff) | |
| download | ATCD-8deb4b821088770ec3509f0dc04526cf882c8647.tar.gz | |
Wed Aug 5 09:40:40 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-win32-msvc-7.h:
Just use fileno with msvc71
* ace/Get_Opt.h:
Zap inline from header file
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/Get_Opt.h | 4 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-7.h | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9a91a8f1f46..174fdae68fc 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 5 09:40:40 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-win32-msvc-7.h: + Just use fileno with msvc71 + + * ace/Get_Opt.h: + Zap inline from header file + Wed Aug 5 09:00:40 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/config/ace_unicode.mpb: diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h index 5c8e9c62888..bb6636b02fd 100644 --- a/ACE/ace/Get_Opt.h +++ b/ACE/ace/Get_Opt.h @@ -182,14 +182,14 @@ public: private: void ACE_Get_Opt_Init (const ACE_TCHAR *optstring); public: - ACE_INLINE ACE_Get_Opt (int argc, + ACE_Get_Opt (int argc, ACE_TCHAR **argv, const ACE_TCHAR *optstring = ACE_TEXT (""), int skip_args = 1, int report_errors = 0, int ordering = PERMUTE_ARGS, int long_only = 0); - ACE_INLINE ACE_Get_Opt (int argc, + ACE_Get_Opt (int argc, ACE_TCHAR **argv, const char *optstring, int skip_args = 1, diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h index 80bbb2b4075..9d1ac7b907b 100644 --- a/ACE/ace/config-win32-msvc-7.h +++ b/ACE/ace/config-win32-msvc-7.h @@ -45,7 +45,6 @@ #define ACE_STRCASECMP_EQUIVALENT ::_stricmp #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#define ACE_FILENO_EQUIVALENT ::_fileno #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_EXCEPTIONS) #define ACE_HAS_EXCEPTIONS |