[lmi-commits] [lmi] master de5a5c7 151/156: Fix interpolate_string_test build

[Greg Chicares]

branch: master
commit de5a5c750464a9a1563e0c6f623eb16c4481868c
Author: Vadim Zeitlin <address@hidden>
Commit: Vadim Zeitlin <address@hidden>

    Fix interpolate_string_test build
    
    The test was broken by typos in 4e76bba3c4fa640368fc70fe745d0e657b8a69c0
    and also triggered a couple of harmless -Wshadow gcc warnings.
---
 interpolate_string_test.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/interpolate_string_test.cpp b/interpolate_string_test.cpp
index a1813bd..2cf81be 100644
--- a/interpolate_string_test.cpp
+++ b/interpolate_string_test.cpp
@@ -45,15 +45,15 @@ int test_main(int, char*[])
     BOOST_TEST_EQUAL( test_interpolate("{{foo}}{{bar}}"), "foobar"  );
 
     // Comments should be just ignored.
-    BOOST_TEST_EQUAL( test_interpolate("{{! ignore me}}", ""        );
-    BOOST_TEST_EQUAL( test_interpolate("{{! too}}{{x}}",  "x"       );
-    BOOST_TEST_EQUAL( test_interpolate("{{x}}{{!also}}",  "x"       );
+    BOOST_TEST_EQUAL( test_interpolate("{{! ignore me}}"), ""       );
+    BOOST_TEST_EQUAL( test_interpolate("{{! too}}{{x}}"),  "x"      );
+    BOOST_TEST_EQUAL( test_interpolate("{{x}}{{!also}}"),  "x"      );
 
     // Sections.
-    auto const section_test = [](char const* s)
+    auto const section_test = [](char const* str)
         {
         return interpolate_string
-            (s
+            (str
             ,[](std::string const& s, interpolate_lookup_kind) -> std::string
                 {
                 if(s == "var0") return "0";
@@ -88,10 +88,10 @@ int test_main(int, char*[])
         );
 
     // Partials.
-    auto const partial_test = [](char const* s)
+    auto const partial_test = [](char const* str)
         {
         return interpolate_string
-            (s
+            (str
             ,[](std::string const& s, interpolate_lookup_kind) -> std::string
                 {
                 if(s == "header")       return "[header with {{var}}]";