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-rvalue_references-N2118.cpp | |
parent | 113e4c6ea581d8573f0a16faa58a7e1abcd888e1 (diff) | |
parent | fa9296278020834d660c9fcc05c32c719263fce3 (diff) |
Resolved README merge conflict
Diffstat (limited to 'cxx11/c++11-test-rvalue_references-N2118.cpp')
-rw-r--r-- | cxx11/c++11-test-rvalue_references-N2118.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/cxx11/c++11-test-rvalue_references-N2118.cpp b/cxx11/c++11-test-rvalue_references-N2118.cpp index ef4e421..75fb555 100644 --- a/cxx11/c++11-test-rvalue_references-N2118.cpp +++ b/cxx11/c++11-test-rvalue_references-N2118.cpp @@ -1,15 +1,15 @@ -int foo(int& lvalue)
-{
- return 123;
-}
-
-int foo(int&& rvalue)
-{
- return 321;
-}
-
-int main()
-{
- int i = 42;
- return ((foo(i) == 123) && (foo(42) == 321)) ? 0 : 1;
-}
+int foo(int& lvalue) +{ + return 123; +} + +int foo(int&& rvalue) +{ + return 321; +} + +int main() +{ + int i = 42; + return ((foo(i) == 123) && (foo(42) == 321)) ? 0 : 1; +} |