[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56837] trunk/blender/extern/libmv/libmv/ tracking: quiet warnings from r56825

[Campbell Barton]

Revision: 56837
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56837
Author:   campbellbarton
Date:     2013-05-16 03:55:47 +0000 (Thu, 16 May 2013)
Log Message:
-----------
quiet warnings from r56825
- using vars before checking they are defined
- /* within comment

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56825

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
    trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc

Modified: trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc	2013-05-16 00:20:57 UTC (rev 56836)
+++ trunk/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc	2013-05-16 03:55:47 UTC (rev 56837)
@@ -62,9 +62,9 @@
 }
 
 /* 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
 

Modified: trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc	2013-05-16 00:20:57 UTC (rev 56836)
+++ trunk/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc	2013-05-16 03:55:47 UTC (rev 56837)
@@ -53,9 +53,9 @@
 }
 
 /* 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