-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix building gtest on MSVC 2010 and newer #793
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The previous define change in 1e607d7 only made it work on MSVC 2005 and 2008, but broke things even more for 2010 and newer. (One shouldn't override the internal details about which tuple implementation to use, since one implementation don't work on all versions.) Since we don't need or use the gtest tuple code, the simplest workaround used to be just to disable it altogether, but that was broken in r682 in gtest. This has been tested and works on MSVC 2005, 2008, 2010, 2012 and 2013.
zhilwang
added a commit
that referenced
this pull request
May 6, 2014
Fix building gtest on MSVC 2010 and newer
huili2
added a commit
to huili2/openh264
that referenced
this pull request
May 6, 2014
commit 7746e3f Merge: 69fe242 853e71e Author: zhilwang <zhilwang@cisco.com> Date: Tue May 6 16:52:57 2014 +0800 Merge pull request cisco#793 from mstorsjo/fix-msvc-gtest Fix building gtest on MSVC 2010 and newer commit 853e71e Author: Martin Storsjö <martin@martin.st> Date: Tue May 6 11:14:41 2014 +0300 Fix building gtest on MSVC The previous define change in 1e607d7 only made it work on MSVC 2005 and 2008, but broke things even more for 2010 and newer. (One shouldn't override the internal details about which tuple implementation to use, since one implementation don't work on all versions.) Since we don't need or use the gtest tuple code, the simplest workaround used to be just to disable it altogether, but that was broken in r682 in gtest. This has been tested and works on MSVC 2005, 2008, 2010, 2012 and 2013. commit 69fe242 Merge: 9a74427 5ed24f2 Author: sijchen <sijchen@cisco.com> Date: Tue May 6 15:29:56 2014 +0800 Merge pull request cisco#790 from huili2/astyle_all astyle all files commit 9a74427 Merge: f897029 92e5489 Author: volvet <qizh@cisco.com> Date: Tue May 6 15:00:01 2014 +0800 Merge pull request cisco#788 from mstorsjo/factorize-duplicated-test Avoid duplicating code in the MotionEstimate test Approved by Sijia. commit f897029 Merge: d4145ee 82b875c Author: huili2 <huili2@cisco.com> Date: Tue May 6 14:00:32 2014 +0800 Merge pull request cisco#791 from zhilwang/intraSad Add func init for welsfillingPred commit d4145ee Merge: 0c24686 1e607d7 Author: huili2 <huili2@cisco.com> Date: Tue May 6 13:59:36 2014 +0800 Merge pull request cisco#792 from zhilwang/msvc-gtest Fix gtest build error when OS=msvc. commit 1e607d7 Author: zhiliang wang <zhilwang@cisco.com> Date: Tue May 6 13:06:37 2014 +0800 Fix gtest build error when OS=msvc. commit 82b875c Author: zhiliang wang <zhilwang@cisco.com> Date: Tue May 6 11:16:46 2014 +0800 Add func init on UT source code commit 2d26587 Author: zhiliang wang <zhilwang@cisco.com> Date: Tue May 6 10:45:25 2014 +0800 Add func init for welsfillingPred commit 5ed24f2 Author: huili2 <huili2@cisco.com> Date: Mon May 5 19:30:21 2014 -0700 astyle all files commit 0c24686 Merge: 15432d4 c0f2487 Author: volvet <qizh@cisco.com> Date: Mon May 5 22:13:43 2014 +0800 Merge pull request cisco#789 from mstorsjo/remove-unused-static-func Remove an unused static method commit 92e5489 Author: Martin Storsjö <martin@martin.st> Date: Mon May 5 16:11:19 2014 +0300 Avoid duplicating code in the MotionEstimate test All the tests of the line search (unoptimized and optimized) use the exact same copypasted structure. Instead factorize this into a test function which uses the provided function. commit c0f2487 Author: Martin Storsjö <martin@martin.st> Date: Mon May 5 15:13:43 2014 +0300 Remove an unused static method This was added in 4464071 without actually being used. commit 15432d4 Merge: cf5edec 4464071 Author: huili2 <huili2@cisco.com> Date: Mon May 5 15:56:31 2014 +0800 Merge pull request cisco#787 from sijchen/fme_merge97 [Encoder ME] Add FME unit test commit 4464071 Author: sijchen <sijchen@cisco.com> Date: Mon May 5 15:41:15 2014 +0800 Add FME unit test commit cf5edec Merge: 81467fd 1711b49 Author: sijchen <sijchen@cisco.com> Date: Mon May 5 10:29:35 2014 +0800 Merge pull request cisco#785 from mstorsjo/fix-me-test Fix occasional errors in the motion estimation tests by correcting the range limits commit 81467fd Merge: f797785 26624bb Author: sijchen <sijchen@cisco.com> Date: Mon May 5 10:27:13 2014 +0800 Merge pull request cisco#786 from mstorsjo/use-proper-types Use the proper type in function parameters instead of void pointers commit f797785 Merge: fd446a1 f99336d Author: zhilwang <zhilwang@cisco.com> Date: Mon May 5 09:26:59 2014 +0800 Merge pull request cisco#782 from mstorsjo/fix-msvc-warning Don't compare a boolean to an integer commit fd446a1 Merge: 5c5a233 b8eeda1 Author: zhilwang <zhilwang@cisco.com> Date: Mon May 5 08:45:48 2014 +0800 Merge pull request cisco#783 from mstorsjo/win64-clobber Properly back up and restore XMM registers on win64 in WelsSampleSadFour4x4_sse2 commit 5c5a233 Merge: e4a9c7f b4fdfa6 Author: Ethan Hugg <ethanhugg@gmail.com> Date: Sun May 4 15:19:51 2014 -0700 Merge pull request cisco#784 from mstorsjo/renamed-lib Take the new external library name in use, fix building for android commit 26624bb Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 18:00:36 2014 +0300 Use the proper type in function parameters instead of void pointers commit 1711b49 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 17:48:39 2014 +0300 Take the test of TestHorizontalSearch_SSE41 into use After fixing the ranges, there's no reason to exclude this test. commit b1c13f4 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 17:40:28 2014 +0300 Properly limit the range for the random target motion vectors A 16x16 pixel block is copied to the destination pointed out by the target motion vector. Since the motion vector is relative to the center of the buffer, the upper bound of the range is size/2-16. Previously we never used negative motion vectors, but there is no reason not to test that direction. Therefore, the possible range would be [-size/2,size/2-16]. Additionally pad this range with INTPEL_NEEDED_MARGIN. commit 03db750 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 17:35:01 2014 +0300 Limit the ME scanning range to 16 pixels from the end of the buffer The block size is chosen randomly; if the block size is 16, LineFullSearch_c will read a block with 16 pixels from kiMaxPos; thus kiMaxPos cannot be larger than height-16, otherwise the calls end up with reads out of bounds. commit b4fdfa6 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 16:00:04 2014 +0300 Use the new library name in the android sample projects commit a0002c2 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 15:57:40 2014 +0300 Use $(PROJECT_NAME) in the android .so name commit dc57301 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 15:55:17 2014 +0300 Rename the DLL definition file according to what the output DLL is named commit 9d0647b Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 15:54:16 2014 +0300 Use $(PROJECT_NAME) for naming the DLL import library as well commit b8eeda1 Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 15:45:51 2014 +0300 Properly back up and restore XMM registers on win64 in WelsSampleSadFour4x4_sse2 commit f99336d Author: Martin Storsjö <martin@martin.st> Date: Sun May 4 14:53:36 2014 +0300 Don't compare a boolean to an integer This avoids a warning when building with MSVC. commit e4a9c7f Merge: 0e7ed62 fe5b8d1 Author: volvet <qizh@cisco.com> Date: Sun May 4 16:29:59 2014 +0800 Merge pull request cisco#779 from zhilwang/intraSad Add IntraSad asm code. commit 0e7ed62 Merge: 30687f4 9380197 Author: ruil2 <ruil2@cisco.com> Date: Sun May 4 15:31:13 2014 +0800 Merge pull request cisco#780 from sijchen/md_merge25 [Encoder MD] Add scrolling skip function pointers in MD commit 9380197 Author: sijchen <sijchen@cisco.com> Date: Sun May 4 15:03:23 2014 +0800 add scrolling skip function pointers in MD commit fe5b8d1 Author: Licai Guo <guolicai@gmail.com> Date: Sun May 4 14:51:05 2014 +0800 refine format commit 30687f4 Merge: ba7b4ad 2ad7bb9 Author: ruil2 <ruil2@cisco.com> Date: Sun May 4 14:25:10 2014 +0800 Merge pull request cisco#761 from sijchen/md_merge31 [Encoder MD] Adjust MD under Screen Content route commit 485b2b5 Author: Licai Guo <guolicai@gmail.com> Date: Wed Apr 30 15:54:49 2014 +0800 Add IntraSad asm code. Enable intraSad ASM code Refine format Add X86_ASM pretect for intraSad ASM code UT remove duplicated code. commit ba7b4ad Merge: 1560eec deb01d3 Author: sijchen <sijchen@cisco.com> Date: Sun May 4 10:24:21 2014 +0800 Merge pull request cisco#778 from ethanhugg/rename Parameterize the project name and change it to openh264 commit deb01d3 Author: Ethan Hugg <ehugg@cisco.com> Date: Fri May 2 08:12:40 2014 -0700 Parameterize the project name and change it to openh264 commit 2ad7bb9 Author: sijchen <sijchen@cisco.com> Date: Tue Apr 29 11:10:15 2014 +0800 adjust the intra md under scc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous define change in 1e607d7 only made it work on MSVC
2005 and 2008, but broke things even more for 2010 and newer.
(One shouldn't override the internal details about which tuple
implementation to use, since one implementation don't work on
all versions.) Since we don't need or use the gtest tuple code,
the simplest workaround used to be just to disable it altogether,
but that was broken in r682 in gtest.
This has been tested and works on MSVC 2005, 2008, 2010, 2012 and
2013.