From fce080f1a8a6092911e0e3e7d0e71863f3fc6f38 Mon Sep 17 00:00:00 2001
From: Damian Jarek <damian.jarek93@gmail.com>
Date: Fri, 31 May 2019 02:05:59 +0200
Subject: [PATCH] Add VS 2019 AzP CI matrix item

The VS 2019 image now includes vcpkg by default, which enables adding
it to CI.

Signed-off-by: Damian Jarek <damian.jarek93@gmail.com>
---
 CHANGELOG.md                     |  1 +
 azure-pipelines.yml              | 12 ++++++------
 test/beast/http/message_fuzz.hpp | 12 +++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 399463be..9d669d2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version 258:
 * Fix separate compilation in CI
 * Fix clang inititalization warning in websocket
 * Remove redundant use of `yield_to` in parser tests
+* Add VS 2019 AzP CI matrix item
 
 --------------------------------------------------------------------------------
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c5f93d0..9a98d26c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -228,12 +228,12 @@ jobs:
     strategy:
       matrix:
         # MSVC14.2: # FIXME(djarek): windows-2019 doesn't have vcpkg
-        #MSVC14.2 C++17 x64:
-          #VM_IMAGE: 'windows-2019'
-          #TOOLSET: msvc-14.2
-          #B2_FLAGS: define=BOOST_BEAST_USE_STD_STRING_VIEW
-          #CXXSTD: 17
-          #ADDRMODEL: 64
+        MSVC14.2 C++17 x64:
+          VM_IMAGE: 'windows-2019'
+          TOOLSET: msvc-14.2
+          B2_FLAGS: define=BOOST_BEAST_USE_STD_STRING_VIEW
+          CXXSTD: 17
+          ADDRMODEL: 64
         MSVC14.1 C++17 x64:
           VM_IMAGE: 'vs2017-win2016'
           TOOLSET: msvc-14.1
diff --git a/test/beast/http/message_fuzz.hpp b/test/beast/http/message_fuzz.hpp
index 038695f8..521f4806 100644
--- a/test/beast/http/message_fuzz.hpp
+++ b/test/beast/http/message_fuzz.hpp
@@ -26,18 +26,16 @@ escaped_string(string_view s)
 {
     std::string out;
     out.reserve(s.size());
-    char const* p = s.data();
-    while(p != s.end())
+    for(char c : s)
     {
-        if(*p == '\r')
+        if(c == '\r')
             out.append("\\r");
-        else if(*p == '\n')
+        else if(c == '\n')
             out.append("\\n");
-        else if(*p == '\t')
+        else if(c == '\t')
             out.append("\\t");
         else
-            out.append(p, 1);
-        ++p;
+            out.append(&c, 1);
     }
     return out;
 }