This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 8485d720847ef5a4b60549bda4291b781951ed46 (commit) via c63d4d54d01d84297743fc0f48e1292df37290a2 (commit) via bf91e8362876c2be2fc6f6a16e8897a7a9cd963e (commit) from d43aa3f5f438c407995fcb9c7f1702666ad1f04d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8485d720847ef5a4b60549bda4291b781951ed46 commit 8485d720847ef5a4b60549bda4291b781951ed46 Merge: d43aa3f c63d4d5 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jul 24 09:33:16 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Jul 24 09:33:16 2014 -0400 Merge topic 'add-liblzma' into next c63d4d54 liblzma: Remove use of MSVC intrinsic bf91e836 liblzma: Suppress MSVC warnings http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c63d4d54d01d84297743fc0f48e1292df37290a2 commit c63d4d54d01d84297743fc0f48e1292df37290a2 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jul 24 09:30:09 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jul 24 09:30:09 2014 -0400 liblzma: Remove use of MSVC intrinsic diff --git a/Utilities/cmliblzma/common/tuklib_integer.h b/Utilities/cmliblzma/common/tuklib_integer.h index e8cb6bf..5e8262a 100644 --- a/Utilities/cmliblzma/common/tuklib_integer.h +++ b/Utilities/cmliblzma/common/tuklib_integer.h @@ -387,13 +387,6 @@ bsr32(uint32_t n) __asm__("bsrl %1, %0" : "=r" (i) : "rm" (n)); return i; -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - // MSVC isn't supported by tuklib, but since this code exists, - // it doesn't hurt to have it here anyway. - uint32_t i; - _BitScanReverse(&i, n); - return i; - #else uint32_t i = 31; @@ -441,11 +434,6 @@ clz32(uint32_t n) : "=r" (i) : "rm" (n)); return i; -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - uint32_t i; - _BitScanReverse(&i, n); - return i ^ 31U; - #else uint32_t i = 0; @@ -491,11 +479,6 @@ ctz32(uint32_t n) __asm__("bsfl %1, %0" : "=r" (i) : "rm" (n)); return i; -#elif defined(_MSC_VER) && _MSC_VER >= 1400 - uint32_t i; - _BitScanForward(&i, n); - return i; - #else uint32_t i = 0; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf91e8362876c2be2fc6f6a16e8897a7a9cd963e commit bf91e8362876c2be2fc6f6a16e8897a7a9cd963e Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Jul 24 09:14:53 2014 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Jul 24 09:14:53 2014 -0400 liblzma: Suppress MSVC warnings diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h index 7481e3d..2bcaeb3 100644 --- a/Utilities/cmliblzma/common/sysdefs.h +++ b/Utilities/cmliblzma/common/sysdefs.h @@ -17,7 +17,7 @@ #define LZMA_SYSDEFS_H #if defined(_MSC_VER) -# pragma warning(disable: 4028 4244 4761) +# pragma warning(push,1) #endif ////////////// ----------------------------------------------------------------------- Summary of changes: Utilities/cmliblzma/common/sysdefs.h | 2 +- Utilities/cmliblzma/common/tuklib_integer.h | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits