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-auto-N2546.cpp | |
| parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
| parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) | |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-auto-N2546.cpp')
| -rw-r--r-- | cxx11/c++11-test-auto-N2546.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cxx11/c++11-test-auto-N2546.cpp b/cxx11/c++11-test-auto-N2546.cpp index dbff414..948648e 100644 --- a/cxx11/c++11-test-auto-N2546.cpp +++ b/cxx11/c++11-test-auto-N2546.cpp @@ -1,12 +1,12 @@ -
-int main()
-{
- auto i = 5;
- auto f = 3.14159f;
- auto d = 3.14159;
- bool ret = (
- (sizeof(f) < sizeof(d)) &&
- (sizeof(i) == sizeof(int))
- );
- return ret ? 0 : 1;
-}
+ +int main() +{ + auto i = 5; + auto f = 3.14159f; + auto d = 3.14159; + bool ret = ( + (sizeof(f) < sizeof(d)) && + (sizeof(i) == sizeof(int)) + ); + return ret ? 0 : 1; +} |