diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-22 13:57:16 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-22 13:57:16 +0000 |
| commit | 5022afb1e070d0012fca958d00cc57fedf77c67f (patch) | |
| tree | fb50538887c96c4656efb63d04aafd3b3e0a55ed | |
| parent | a4ce5d5c13ec3e7c2f3455304e53f6af92b34870 (diff) | |
| download | ATCD-5022afb1e070d0012fca958d00cc57fedf77c67f.tar.gz | |
Thu Feb 22 13:56:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 14 | ||||
| -rw-r--r-- | ACE/ace/Makefile.am | 3 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.inl | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 4afaa129d2a..1f1dda25ddd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 22 13:56:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Makefile.am: + Added Notification_Queue.{h,cpp,inl}: + + * ace/OS_NS_dirent.inl: + Added include when ACE_LACKS_ALPHASORT is defined + Thu Feb 22 13:03:01 UTC 2007 Carlos O'Ryan <coryan@atdesk.com> * Merged changes from the bug_2815 branch. From revision 77182 to @@ -78,7 +86,7 @@ Thu Feb 22 13:03:01 UTC 2007 Carlos O'Ryan <coryan@atdesk.com> * tests/run_test.lst: * tests/Notification_Queue_Unit_Test.cpp: New unit test for the notification queue class. - + * ace/Dev_Poll_Reactor.h: * ace/Dev_Poll_Reactor.cpp: * ace/Select_Reactor_Base.h: @@ -102,11 +110,11 @@ Thu Feb 22 13:03:01 UTC 2007 Carlos O'Ryan <coryan@atdesk.com> Sun Feb 18 21:13:41 UTC 2007 coryan <coryan@atdesk.com> - * tests/tests.mpc: + * tests/tests.mpc: * tests/Bug_2815_Regression_Test.cpp: Add new regression test for bug 2815. I have not added the test to the automated test suite because (1) it fails, and (2) it is - a test to reproduce performance + a test to reproduce performance Thu Feb 22 12:58:42 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index 7846a88d612..1e92291d19a 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -166,6 +166,7 @@ libACE_la_SOURCES = \ Naming_Context.cpp \ Netlink_Addr.cpp \ Notification_Strategy.cpp \ + Notification_Queue.cpp \ OS_Errno.cpp \ OS_Log_Msg_Attributes.cpp \ OS_NS_Thread.cpp \ @@ -699,6 +700,8 @@ nobase_include_HEADERS += \ Node.h \ Notification_Strategy.h \ Notification_Strategy.inl \ + Notification_Queue.h \ + Notification_Queue.inl \ Null_Barrier.h \ Null_Condition.h \ Null_Mutex.h \ diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index 56c5d5721aa..dc58e6a1586 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -4,6 +4,10 @@ #include "ace/OS_Memory.h" +#if defined (ACE_LACKS_ALPHASORT) +# include "ace/OS_NS_string.h" +#endif /* ACE_LACKS_ALPHASORT */ + ACE_BEGIN_VERSIONED_NAMESPACE_DECL namespace ACE_OS |