Merge pull request #1 from alecthomas/master

Merge changes from upstream

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;
+}