This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 73843ea564565817a5f54b07b10fe8e5dec0ff6f Author: David Capello <davidcape...@gmail.com> Date: Tue Jun 28 10:22:32 2016 -0300 Add base::this_thread::native_handle() function --- src/base/LICENSE.txt | 2 +- src/base/README.md | 2 +- src/base/thread.cpp | 15 ++++++++++++++- src/base/thread.h | 3 ++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/base/LICENSE.txt b/src/base/LICENSE.txt index 7ed8f20..0d2d81f 100644 --- a/src/base/LICENSE.txt +++ b/src/base/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2001-2015 David Capello +Copyright (c) 2001-2016 David Capello Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/src/base/README.md b/src/base/README.md index 3317ebb..116bc33 100644 --- a/src/base/README.md +++ b/src/base/README.md @@ -1,5 +1,5 @@ # Aseprite Base Library -*Copyright (C) 2001-2015 David Capello* +*Copyright (C) 2001-2016 David Capello* > Distributed under [MIT license](LICENSE.txt) diff --git a/src/base/thread.cpp b/src/base/thread.cpp index 7946586..7eaff6f 100644 --- a/src/base/thread.cpp +++ b/src/base/thread.cpp @@ -1,5 +1,5 @@ // Aseprite Base Library -// Copyright (c) 2001-2013, 2015 David Capello +// Copyright (c) 2001-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -152,3 +152,16 @@ void base::this_thread::sleep_for(double seconds) #endif } + +base::thread::native_handle_type base::this_thread::native_handle() +{ +#ifdef _WIN32 + + return GetCurrentThread(); + +#else + + return (void*)pthread_self(); + +#endif +} diff --git a/src/base/thread.h b/src/base/thread.h index 8663d7b..e3f8521 100644 --- a/src/base/thread.h +++ b/src/base/thread.h @@ -1,5 +1,5 @@ // Aseprite Base Library -// Copyright (c) 2001-2013 David Capello +// Copyright (c) 2001-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -92,6 +92,7 @@ namespace base { // Based on C++0x threads lib { void yield(); void sleep_for(double seconds); + thread::native_handle_type native_handle(); } // This class joins the thread in its destructor. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits