fix gpu::DeviceInfo compilation under linux

glibc defines major and minor macros which conflict with gpu::DeviceInfo methods with the same name
2013-06-21 13:53:56 +04:00
parent eff6dccb3b
commit 98bd401534
12 changed files with 29 additions and 29 deletions
--- a/samples/gpu/stereo_multi.cpp
+++ b/samples/gpu/stereo_multi.cpp
@@ -81,8 +81,8 @@ int main(int argc, char** argv)
        if (!dev_info.isCompatible())
        {
            std::cout << "GPU module isn't built for GPU #" << i << " ("
-                 << dev_info.name() << ", CC " << dev_info.major()
-                 << dev_info.minor() << "\n";
+                 << dev_info.name() << ", CC " << dev_info.majorVersion()
+                 << dev_info.minorVersion() << "\n";
            return -1;
        }
    }