[lmi-commits] [lmi] master f5d41a0 7/8: Replace raw string literals

[Greg Chicares]

branch: master
commit f5d41a09ecf2e6df1acf4b6f59f8e44a30d1f096
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Replace raw string literals
---
 rate_table_test.cpp | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/rate_table_test.cpp b/rate_table_test.cpp
index e131dbf..a0794d5 100644
--- a/rate_table_test.cpp
+++ b/rate_table_test.cpp
@@ -129,23 +129,20 @@ int const qx_cso_num_tables = 142;
 
 std::string const qx_ins_path("/opt/lmi/data/qx_ins");
 
-// NB: "1+" is used here just to allow formatting multiline strings in a
-// natural way and strips the leading new line.
-
 /// Prefix used for the test tables.
-std::string const simple_table_header(1 + R"table(
-Table number: 1
-Table type: Aggregate
-Minimum age: 0
-Maximum age: 1
-Number of decimal places: 5
-Table values:
-)table");
-
-std::string const simple_table_values(1 + R"table(
-  0  0.12345
-  1  0.23456
-)table");
+std::string const simple_table_header =
+    "Table number: 1\n"
+    "Table type: Aggregate\n"
+    "Minimum age: 0\n"
+    "Maximum age: 1\n"
+    "Number of decimal places: 5\n"
+    "Table values:\n"
+    ;
+
+std::string const simple_table_values =
+    "  0  0.12345\n"
+    "  1  0.23456\n"
+    ;
 
 /// Minimal valid SOA table in text format.
 std::string const simple_table_text(simple_table_header + simple_table_values);
@@ -154,16 +151,16 @@ std::string const simple_table_text(simple_table_header + 
simple_table_values);
 /// 'rate_table.cpp', both write these table values in a field of width
 /// four: two spaces between columns, plus one for the data, plus one
 /// for a nonexistent decimal point.
-std::string const integral_table(1 + R"table(
-Table number: 1
-Table type: Aggregate
-Minimum age: 0
-Maximum age: 1
-Number of decimal places: 0
-Table values:
-  0   0
-  1   1
-)table");
+std::string const integral_table =
+    "Table number: 1\n"
+    "Table type: Aggregate\n"
+    "Minimum age: 0\n"
+    "Maximum age: 1\n"
+    "Number of decimal places: 0\n"
+    "Table values:\n"
+    "  0   0\n"
+    "  1   1\n"
+    ;
 } // Unnamed namespace.
 
 /// Test opening database files.