diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Thread_Adapter.h | |
parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Thread_Adapter.h')
-rw-r--r-- | dep/acelite/ace/Thread_Adapter.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dep/acelite/ace/Thread_Adapter.h b/dep/acelite/ace/Thread_Adapter.h index d7ab4056de4..6880e2cb2cd 100644 --- a/dep/acelite/ace/Thread_Adapter.h +++ b/dep/acelite/ace/Thread_Adapter.h @@ -4,7 +4,7 @@ /** * @file Thread_Adapter.h * - * $Id: Thread_Adapter.h 92060 2010-09-27 18:08:48Z johnnyw $ + * $Id: Thread_Adapter.h 92682 2010-11-23 23:41:19Z shuston $ * * @author Carlos O'Ryan <coryan@uci.edu> */ @@ -56,6 +56,7 @@ public: , ACE_SEH_EXCEPT_HANDLER selector = 0, ACE_SEH_EXCEPT_HANDLER handler = 0 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ + , long cancel_flags = 0 ); /** |