minor + warnings

2011-02-15 15:09:54 +00:00
parent f10bff2653
commit 6b34532901
7 changed files with 28 additions and 13 deletions
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -72,7 +72,7 @@ namespace cv
            FEATURE_SET_COMPUTE_13 = 13,
            FEATURE_SET_COMPUTE_20 = 20,
            FEATURE_SET_COMPUTE_21 = 21,
-            ATOMICS = FEATURE_SET_COMPUTE_11,
+            GLOBAL_ATOMICS = FEATURE_SET_COMPUTE_11,
            NATIVE_DOUBLE = FEATURE_SET_COMPUTE_13
        };