diff options
| author | Antony Woods <acron1@gmail.com> | 2013-10-30 08:38:58 +0000 |
|---|---|---|
| committer | Antony Woods <acron1@gmail.com> | 2013-10-30 08:38:58 +0000 |
| commit | 592f570433a87cee508e30457af58dde4121e705 (patch) | |
| tree | 8f5fdbe7dcb169ea54d1123d97b952de502c5733 /cxx11/demo.cpp | |
| parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
| parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) | |
Resolved README merge conflict
Diffstat (limited to 'cxx11/demo.cpp')
| -rw-r--r-- | cxx11/demo.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/cxx11/demo.cpp b/cxx11/demo.cpp index 782681b..f647d15 100644 --- a/cxx11/demo.cpp +++ b/cxx11/demo.cpp @@ -1,23 +1,23 @@ -
-#include <iostream>
-
-int main()
-{
- std::cout << "Testing\n";
- std::cout << "Has static_assert: " <<
-#ifdef HAS_CXX11_STATIC_ASSERT
- "yes :)"
-#else
- "no"
-#endif
- << "\n";
- std::cout << "Has variadic templates: " <<
-#ifdef HAS_CXX11_VARIADIC_TEMPLATES
- "yes :)"
-#else
- "no"
-#endif
- << "\n";
- return 0;
-}
-
+ +#include <iostream> + +int main() +{ + std::cout << "Testing\n"; + std::cout << "Has static_assert: " << +#ifdef HAS_CXX11_STATIC_ASSERT + "yes :)" +#else + "no" +#endif + << "\n"; + std::cout << "Has variadic templates: " << +#ifdef HAS_CXX11_VARIADIC_TEMPLATES + "yes :)" +#else + "no" +#endif + << "\n"; + return 0; +} + |