Merge remote-tracking branch 'remotes/origin/develop'

This commit is contained in:
Beman
2015-01-06 11:08:27 -05:00
2 changed files with 13 additions and 1 deletions

11
meta/libraries.json Normal file
View File

@ -0,0 +1,11 @@
{
"key": "system",
"name": "System",
"authors": [
"Beman Dawes"
],
"description": "Operating system support, including the diagnostics support that will be part of the C++0x standard library.",
"category": [
"System"
]
}

View File

@ -41,7 +41,8 @@ int main()
std::cout << "BOOST_POSIX_API is not defined" << std::endl;
#endif
#ifdef BOOST_PLAT_WINDOWS_DESKTOP
std::cout << "BOOST_PLAT_WINDOWS_DESKTOP is defined" << std::endl;
std::cout << "BOOST_PLAT_WINDOWS_DESKTOP is defined as "
<< BOOST_PLAT_WINDOWS_DESKTOP << std::endl;
#else
std::cout << "BOOST_PLAT_WINDOWS_DESKTOP is not defined" << std::endl;
#endif