diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-07-20 15:35:34 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-07-20 15:35:34 +0000 |
| commit | 689319d6a5f4818588917d550fd6cab25d1b5dc7 (patch) | |
| tree | 0d9ee6f6514b85bd88d55fa0c88520f47e8d0c3c | |
| parent | 8a074fb89e33aad1c7e346bc2609f391d8669b7c (diff) | |
| download | ATCD-689319d6a5f4818588917d550fd6cab25d1b5dc7.tar.gz | |
ChangeLogTag:Thu
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ace/Basic_Types.h | 2 | ||||
| -rw-r--r-- | ace/Sig_Handler.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index bc2dd8bc87d..556f30e3dac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,8 @@ Thu Jul 20 15:19:30 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> # include "ace/os_include/netinet/os_in.h" // Get ntohl() - to fix the problems introduced with + and added the inline keyword to ACE_NTOHLL() to fix the problems + introduced with Wed Jul 19 22:46:51 UTC 2006 Ossama Othman <ossama_othman at symantec dot com> diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 469cf14e8bf..f349eaed4ea 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -589,7 +589,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL # endif /* ACE_LACKS_LONGLONG_T */ -ACE_UINT64 +inline ACE_UINT64 ACE_NTOHLL (ACE_UINT64 x) { return diff --git a/ace/Sig_Handler.cpp b/ace/Sig_Handler.cpp index 47f09441593..c66a43c7517 100644 --- a/ace/Sig_Handler.cpp +++ b/ace/Sig_Handler.cpp @@ -7,14 +7,12 @@ #include "ace/Managed_Object.h" #include "ace/Containers.h" - #if !defined (__ACE_INLINE__) #include "ace/Sig_Handler.inl" #endif /* __ACE_INLINE__ */ ACE_RCSID(ace, Sig_Handler, "$Id$") - #if defined (ACE_HAS_SIG_C_FUNC) extern "C" void |