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-sizeof_member-N2253.cpp | |
| parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
| parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) | |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-sizeof_member-N2253.cpp')
| -rw-r--r-- | cxx11/c++11-test-sizeof_member-N2253.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cxx11/c++11-test-sizeof_member-N2253.cpp b/cxx11/c++11-test-sizeof_member-N2253.cpp index 3049ed1..a55fc09 100644 --- a/cxx11/c++11-test-sizeof_member-N2253.cpp +++ b/cxx11/c++11-test-sizeof_member-N2253.cpp @@ -1,14 +1,14 @@ -struct foo {
- char bar;
- int baz;
-};
-
-int main(void)
-{
- bool ret = (
- (sizeof(foo::bar) == 1) &&
- (sizeof(foo::baz) >= sizeof(foo::bar)) &&
- (sizeof(foo) >= sizeof(foo::bar)+sizeof(foo::baz))
- );
- return ret ? 0 : 1;
-}
+struct foo { + char bar; + int baz; +}; + +int main(void) +{ + bool ret = ( + (sizeof(foo::bar) == 1) && + (sizeof(foo::baz) >= sizeof(foo::bar)) && + (sizeof(foo) >= sizeof(foo::bar)+sizeof(foo::baz)) + ); + return ret ? 0 : 1; +} |