diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-16 07:55:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-16 07:55:47 +0400 |
| commit | 89824393831080dd27a1618e86cb792a6c099e6e (patch) | |
| tree | ac2873a0d78b3a6e980ca458546e941eb1441b0e /extern | |
| parent | b0bb21e32d08f3efe6e8913407be0007244008c2 (diff) | |
quiet warnings from r56825
- using vars before checking they are defined
- /* within comment
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/libmv/tracking/esm_region_tracker.cc | 4 | ||||
| -rw-r--r-- | extern/libmv/libmv/tracking/lmicklt_region_tracker.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extern/libmv/libmv/tracking/esm_region_tracker.cc b/extern/libmv/libmv/tracking/esm_region_tracker.cc index a0c2e4be36e..d50c9420767 100644 --- a/extern/libmv/libmv/tracking/esm_region_tracker.cc +++ b/extern/libmv/libmv/tracking/esm_region_tracker.cc @@ -62,9 +62,9 @@ static bool RegionIsInBounds(const FloatImage &image1, } /* Ugly but necessary fix for compilation on VS2012 -/* this file causes an Internal Compiler Error */ + * this file causes an Internal Compiler Error */ // TODO: check regularly if ICE is fixed by MS! -#if (_MSC_VER >= 1700 && _WIN64) +#if defined(_MSC_VER) && defined(_WIN64) && (_MSC_VER >= 1700) #pragma optimize("s", on) #endif diff --git a/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc b/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc index c9ad364d1d7..5b281870f8d 100644 --- a/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc +++ b/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc @@ -53,9 +53,9 @@ static bool RegionIsInBounds(const FloatImage &image1, } /* Ugly but necessary fix for compilation on VS2012 -/* this file causes an Internal Compiler Error */ + * this file causes an Internal Compiler Error */ // TODO: check regularly if ICE is fixed by MS! -#if (_MSC_VER >= 1700 && _WIN64) +#if defined(_WIN64) && defined(_MSC_VER) && (_MSC_VER >= 1700) #pragma optimize("s", on) #endif |