diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-26 05:38:06 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-26 05:38:06 +0000 |
| commit | f7afa5f3a98b7ce6fca0cf43d0a39ef68253428f (patch) | |
| tree | 0f5fd33f17cb53771b8d62cb8b8e05c21db131c8 /ace | |
| parent | 58994bd9d670d218d7454274111b34a71d12502b (diff) | |
| download | ATCD-f7afa5f3a98b7ce6fca0cf43d0a39ef68253428f.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/CORBA_Handler.h | 10 | ||||
| -rw-r--r-- | ace/Filecache.cpp | 2 | ||||
| -rw-r--r-- | ace/OS.h | 12 |
3 files changed, 13 insertions, 11 deletions
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h index f32ac335e6a..e1de58eb3e5 100644 --- a/ace/CORBA_Handler.h +++ b/ace/CORBA_Handler.h @@ -30,16 +30,6 @@ #undef EXCEPTIONS #undef WANT_ORBIX_FDS -#if defined (ACE_WIN32) && !defined (ACE_ORBIX_HAS_NAMESPACES) -#define ACE_CORBA_1(NAME) CORBA_##NAME -#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME -#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE##::##NAME -#else -#define ACE_CORBA_1(NAME) CORBA::##NAME -#define ACE_CORBA_2(TYPE, NAME) CORBA::##TYPE##::##NAME -#define ACE_CORBA_3(TYPE, NAME) CORBA::##TYPE##::##NAME -#endif /* ACE_WIN32 */ - class ACE_Export ACE_CORBA_Handler : public ACE_Service_Object // = TITLE // Handle CORBA requests in conjunction with ACE. diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp index 29e881d331c..62e79cd60be 100644 --- a/ace/Filecache.cpp +++ b/ace/Filecache.cpp @@ -382,7 +382,7 @@ ACE_Filecache::finish (ACE_Filecache_Object *&file) file->release (); this->remove_i ((char *) file->filename_); - result = this->hash_.bind (file->filename_, file); + result = this->hash_.bind (file->filename (), file); if (result == 0) file->acquire (); @@ -22,6 +22,18 @@ // configuration file (e.g., config-sunos5-sunc++-4.x.h). #include "ace/config.h" +// Deal with MSVC++ insanity for CORBA... +#if defined (ACE_WIN32) && !defined (ACE_ORBIX_HAS_NAMESPACES) +#define ACE_CORBA_1(NAME) CORBA_##NAME +#define ACE_CORBA_2(TYPE, NAME) CORBA_##TYPE##_##NAME +#define ACE_CORBA_3(TYPE, NAME) CORBA_##TYPE##::##NAME +#else +#define ACE_CORBA_1(NAME) CORBA::##NAME +#define ACE_CORBA_2(TYPE, NAME) CORBA::##TYPE##::##NAME +#define ACE_CORBA_3(TYPE, NAME) CORBA::##TYPE##::##NAME +#endif /* ACE_WIN32 */ + +// Define some helpful macros. #define ACE_ONE_SECOND_IN_MSECS 1000L #define ACE_ONE_SECOND_IN_USECS 1000000L #define ACE_ONE_SECOND_IN_NSECS 1000000000L |