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/c++11-test-__func__-N2340.cpp | |
parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-__func__-N2340.cpp')
-rw-r--r-- | cxx11/c++11-test-__func__-N2340.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cxx11/c++11-test-__func__-N2340.cpp b/cxx11/c++11-test-__func__-N2340.cpp index c10dd18..d961df8 100644 --- a/cxx11/c++11-test-__func__-N2340.cpp +++ b/cxx11/c++11-test-__func__-N2340.cpp @@ -1,8 +1,8 @@ -#include <cstring>
-
-int main()
-{
- if (!__func__) { return 1; }
- if(std::strlen(__func__) <= 0) { return 1; }
- return 0;
-}
+#include <cstring> + +int main() +{ + if (!__func__) { return 1; } + if(std::strlen(__func__) <= 0) { return 1; } + return 0; +} |