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-constexpr-N2235.cpp | |
| parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
| parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) | |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-constexpr-N2235.cpp')
| -rw-r--r-- | cxx11/c++11-test-constexpr-N2235.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/cxx11/c++11-test-constexpr-N2235.cpp b/cxx11/c++11-test-constexpr-N2235.cpp index 9f969e4..ed62451 100644 --- a/cxx11/c++11-test-constexpr-N2235.cpp +++ b/cxx11/c++11-test-constexpr-N2235.cpp @@ -1,19 +1,19 @@ -constexpr int square(int x)
-{
- return x*x;
-}
-
-constexpr int the_answer()
-{
- return 42;
-}
-
-int main()
-{
- int test_arr[square(3)];
- bool ret = (
- (square(the_answer()) == 1764) &&
- (sizeof(test_arr)/sizeof(test_arr[0]) == 9)
- );
- return ret ? 0 : 1;
-}
+constexpr int square(int x) +{ + return x*x; +} + +constexpr int the_answer() +{ + return 42; +} + +int main() +{ + int test_arr[square(3)]; + bool ret = ( + (square(the_answer()) == 1764) && + (sizeof(test_arr)/sizeof(test_arr[0]) == 9) + ); + return ret ? 0 : 1; +} |