generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix gpu::DeviceInfo compilation under linux

Browse Source 
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
This commit is contained in:
Vladislav Vinogradov
2013-06-21 13:53:56 +04:00
parent eff6dccb3b
commit 98bd401534
12 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/gpu/driver_api_multi.cpp
View File

@@ -86,8 +86,8 @@ int main()
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;
}
}

4
samples/gpu/driver_api_stereo_multi.cpp
View File

@@ -116,8 +116,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;
}
}

4
samples/gpu/multi.cpp
View File

@@ -62,8 +62,8 @@ int main()
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;
}
}

2
samples/gpu/performance/performance.cpp
View File

@@ -191,7 +191,7 @@ int main(int argc, const char* argv[])
DeviceInfo dev_info(device);
if (!dev_info.isCompatible())
{
cerr << "GPU module isn't built for GPU #" << device << " " << dev_info.name() << ", CC " << dev_info.major() << '.' << dev_info.minor() << endl;
cerr << "GPU module isn't built for GPU #" << device << " " << dev_info.name() << ", CC " << dev_info.majorVersion() << '.' << dev_info.minorVersion() << endl;
return -1;
}
setDevice(device);

4
samples/gpu/stereo_multi.cpp
View File

@@ -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;
}
}