2023-10-24 21:59:30 -04:00
|
|
|
<!DOCTYPE html>
|
|
|
|
|
<html lang="en" dir="ltr"
|
|
|
|
|
xmlns:dc="http://purl.org/dc/terms/">
|
|
|
|
|
<head>
|
|
|
|
|
<meta charset="utf-8" />
|
|
|
|
|
<meta name="generator" content="diff2html.py (http://git.droids-corp.org/gitweb/?p=diff2html)" />
|
|
|
|
|
<!--meta name="author" content="Fill in" /-->
|
|
|
|
|
<title>HTML Diff chat/chat_server.cpp</title>
|
|
|
|
|
<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAACVBMVEXAAAAAgAD///+K/HwIAAAAJUlEQVQI12NYBQQM2IgGBQ4mCIEQW7oyK4phampkGIQAc1G1AQCRxCNbyW92oQAAAABJRU5ErkJggg==" type="image/png" />
|
|
|
|
|
<meta property="dc:language" content="en" />
|
|
|
|
|
<!--meta property="dc:date" content="" /-->
|
|
|
|
|
<meta property="dc:modified" content="2023-07-30T17:02:07.328770+01:00" />
|
|
|
|
|
<meta name="description" content="File comparison" />
|
|
|
|
|
<meta property="dc:abstract" content="File comparison" />
|
|
|
|
|
<style>
|
|
|
|
|
table { border:0px; border-collapse:collapse; width: 100%; font-size:0.75em; font-family: Lucida Console, monospace }
|
|
|
|
|
td.line { color:#8080a0 }
|
|
|
|
|
th { background: black; color: white }
|
|
|
|
|
tr.diffunmodified td { background: #D0D0E0 }
|
|
|
|
|
tr.diffhunk td { background: #A0A0A0 }
|
|
|
|
|
tr.diffadded td { background: #CCFFCC }
|
|
|
|
|
tr.diffdeleted td { background: #FFCCCC }
|
|
|
|
|
tr.diffchanged td { background: #FFFFA0 }
|
|
|
|
|
span.diffchanged2 { background: #E0C880 }
|
|
|
|
|
span.diffponct { color: #B08080 }
|
|
|
|
|
tr.diffmisc td {}
|
|
|
|
|
tr.diffseparator td {}
|
|
|
|
|
</style>
|
|
|
|
|
</head>
|
|
|
|
|
<body>
|
|
|
|
|
|
|
|
|
|
<table class="diff">
|
|
|
|
|
<tr><th colspan='2'>src/​examples/​cpp03/​chat/​chat_server.​cpp</th><th colspan='2'>src/​examples/​cpp11/​chat/​chat_server.​cpp</th></tr>
|
|
|
|
|
<tr class="diffhunk"><td colspan="2">⋮</td><td colspan="2">⋮</td></tr><tr class="diffunmodified"><td class="diffline">1 </td><td class="diffpresent">/​/​</td><td class="diffline">1 </td><td class="diffpresent">/​/​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">2 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​chat_server.​cpp</td><td class="diffline">2 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​chat_server.​cpp</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">3 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​~~~~~~~~~~~~~~~</td><td class="diffline">3 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​~~~~~~~~~~~~~~~</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">4 </td><td class="diffpresent">/​/​</td><td class="diffline">4 </td><td class="diffpresent">/​/​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">5 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Copyright<span class="diffponct">·</span>​(c)​<span class="diffponct">·</span>​2003-​2023<span class="diffponct">·</span>​Christopher<span class="diffponct">·</span>​M.​<span class="diffponct">·</span>​Kohlhoff<span class="diffponct">·</span>​(chris<span class="diffponct">·</span>​at<span class="diffponct">·</span>​kohlhoff<span class="diffponct">·</span>​dot<span class="diffponct">·</span>​com)​</td><td class="diffline">5 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Copyright<span class="diffponct">·</span>​(c)​<span class="diffponct">·</span>​2003-​2023<span class="diffponct">·</span>​Christopher<span class="diffponct">·</span>​M.​<span class="diffponct">·</span>​Kohlhoff<span class="diffponct">·</span>​(chris<span class="diffponct">·</span>​at<span class="diffponct">·</span>​kohlhoff<span class="diffponct">·</span>​dot<span class="diffponct">·</span>​com)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">6 </td><td class="diffpresent">/​/​</td><td class="diffline">6 </td><td class="diffpresent">/​/​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">7 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Distributed<span class="diffponct">·</span>​under<span class="diffponct">·</span>​the<span class="diffponct">·</span>​Boost<span class="diffponct">·</span>​Software<span class="diffponct">·</span>​License,​<span class="diffponct">·</span>​Version<span class="diffponct">·</span>​1.​0.​<span class="diffponct">·</span>​(See<span class="diffponct">·</span>​accompanying</td><td class="diffline">7 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​Distributed<span class="diffponct">·</span>​under<span class="diffponct">·</span>​the<span class="diffponct">·</span>​Boost<span class="diffponct">·</span>​Software<span class="diffponct">·</span>​License,​<span class="diffponct">·</span>​Version<span class="diffponct">·</span>​1.​0.​<span class="diffponct">·</span>​(See<span class="diffponct">·</span>​accompanying</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">8 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​file<span class="diffponct">·</span>​LICENSE_1_0.​txt<span class="diffponct">·</span>​or<span class="diffponct">·</span>​copy<span class="diffponct">·</span>​at<span class="diffponct">·</span>​http:​/​/​www.​boost.​org/​LICENSE_1_0.​txt)​</td><td class="diffline">8 </td><td class="diffpresent">/​/​<span class="diffponct">·</span>​file<span class="diffponct">·</span>​LICENSE_1_0.​txt<span class="diffponct">·</span>​or<span class="diffponct">·</span>​copy<span class="diffponct">·</span>​at<span class="diffponct">·</span>​http:​/​/​www.​boost.​org/​LICENSE_1_0.​txt)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">9 </td><td class="diffpresent">/​/​</td><td class="diffline">9 </td><td class="diffpresent">/​/​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">10 </td><td class="diffpresent"></td><td class="diffline">10 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">11 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<algorithm></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">12 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<cstdlib></td><td class="diffline">11 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<cstdlib></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">13 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<deque></td><td class="diffline">12 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<deque></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">14 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<iostream></td><td class="diffline">13 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<iostream></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">15 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<list></td><td class="diffline">14 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<list></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">15 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<memory></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">16 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<set></td><td class="diffline">16 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<set></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">17 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span>t<span class="diffchanged2">/​</span><span class="diffchanged2">b</span>i<span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">/​</span><span class="diffchanged2">b</span>i<span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">.​</span><span class="diffchanged2">h</span><span class="diffchanged2">p</span><span class="diffchanged2">p</span>></td><td class="diffline">17 </td><td class="diffpresent">#include<span class="diffponct">·</span>​<<span class="diffchanged2">u</span>ti<span class="diffchanged2">l</span>i<span class="diffchanged2">t</span><span class="diffchanged2">y</span>></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">18 </td><td class="diffpresent"><span class="diffchanged2">#</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span><span class="diffchanged2">l</span><span class="diffchanged2">u</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">/​</span><span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">r</span><span class="diffchanged2">.​</span><span class="diffchanged2">h</span><span class="diffchanged2">p</span><span class="diffchanged2">p</span><span class="diffchanged2">></span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">19 </td><td class="diffpresent"><span class="diffchanged2">#</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span><span class="diffchanged2">l</span><span class="diffchanged2">u</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">/​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">a</span><span class="diffchanged2">b</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h​</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">.​</span><span class="diffchanged2">h</span><span class="diffchanged2">p</span><span class="diffchanged2">p</span><span class="diffchanged2">></span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">20 </td><td class="diffpresent">#include<span class="diffponct">·</span>​"asio.​hpp"</td><td class="diffline">18 </td><td class="diffpresent">#include<span class="diffponct">·</span>​"asio.​hpp"</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">21 </td><td class="diffpresent">#include<span class="diffponct">·</span>​"chat_message.​hpp"</td><td class="diffline">19 </td><td class="diffpresent">#include<span class="diffponct">·</span>​"chat_message.​hpp"</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">22 </td><td class="diffpresent"></td><td class="diffline">20 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">23 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​ip:​:​tcp;​</td><td class="diffline">21 </td><td class="diffpresent">using<span class="diffponct">·</span>​asio:​:​ip:​:​tcp;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">24 </td><td class="diffpresent"></td><td class="diffline">22 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">25 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td><td class="diffline">23 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">26 </td><td class="diffpresent"></td><td class="diffline">24 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">27 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​std:​:​deque<chat_message><span class="diffponct">·</span>​chat_message_queue;​</td><td class="diffline">25 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​std:​:​deque<chat_message><span class="diffponct">·</span>​chat_message_queue;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">28 </td><td class="diffpresent"></td><td class="diffline">26 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">29 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td><td class="diffline">27 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">30 </td><td class="diffpresent"></td><td class="diffline">28 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">31 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_participant</td><td class="diffline">29 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_participant</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">32 </td><td class="diffpresent">{</td><td class="diffline">30 </td><td class="diffpresent">{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">33 </td><td class="diffpresent">public:​</td><td class="diffline">31 </td><td class="diffpresent">public:​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">34 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​virtual<span class="diffponct">·</span>​~chat_participant()​<span class="diffponct">·</span>​{}</td><td class="diffline">32 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​virtual<span class="diffponct">·</span>​~chat_participant()​<span class="diffponct">·</span>​{}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">35 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​virtual<span class="diffponct">·</span>​void<span class="diffponct">·</span>​deliver(const<span class="diffponct">·</span>​chat_message&<span class="diffponct">·</span>​msg)​<span class="diffponct">·</span>​=<span class="diffponct">·</span>​0;​</td><td class="diffline">33 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​virtual<span class="diffponct">·</span>​void<span class="diffponct">·</span>​deliver(const<span class="diffponct">·</span>​chat_message&<span class="diffponct">·</span>​msg)​<span class="diffponct">·</span>​=<span class="diffponct">·</span>​0;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">36 </td><td class="diffpresent">};​</td><td class="diffline">34 </td><td class="diffpresent">};​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">37 </td><td class="diffpresent"></td><td class="diffline">35 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">38 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span>st:​:​shared_ptr<chat_parti​cipant><span class="diffponct">·</span>​chat_participant_ptr;​</td><td class="diffline">36 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​st<span class="diffchanged2">d</span>:​:​shared_ptr<chat_parti​cipant><span class="diffponct">·</span>​chat_participant_ptr;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">39 </td><td class="diffpresent"></td><td class="diffline">37 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">40 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td><td class="diffline">38 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">41 </td><td class="diffpresent"></td><td class="diffline">39 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">42 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_room</td><td class="diffline">40 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_room</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">43 </td><td class="diffpresent">{</td><td class="diffline">41 </td><td class="diffpresent">{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">44 </td><td class="diffpresent">public:​</td><td class="diffline">42 </td><td class="diffpresent">public:​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">45 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​join(chat_participant​_ptr<span class="diffponct">·</span>​participant)​</td><td class="diffline">43 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​join(chat_participant​_ptr<span class="diffponct">·</span>​participant)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">46 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">44 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">47 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​participants_.​insert(participant)​;​</td><td class="diffline">45 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​participants_.​insert(participant)​;​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">48 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>for<span class="diffchanged2">_</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span>(<span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span>t<span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span>s<span class="diffchanged2">_​</span><span class="diffchanged2">.​</span><span class="diffchanged2">b</span><span class="diffchanged2">e</span>g<span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​recent_msgs_<span class="diffchanged2">.​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span>)​<span class="diffchanged2">,​</span></td><td class="diffline">46 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​for<span class="diffchanged2"><span class="diffponct">·</span>​</span>(<span class="diffchanged2">a</span><span class="diffchanged2">u</span>t<span class="diffchanged2">o</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">m</span>sg<span class="diffchanged2">:​</span><span class="diffponct">·</span>​recent_msgs_)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">49 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span>participan​t<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>deliver<span class="diffchanged2">,​</span></td><td class="diffline">47 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​participant<span class="diffchanged2">-​</span><span class="diffchanged2">></span>deliver<span class="diffchanged2">(</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">50 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">p</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">t</span><span class="diffchanged2">i</span><span class="diffchanged2">c</span><span class="diffchanged2">i</span><span class="diffchanged2">p</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">_</span><span class="diffchanged2">1</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">51 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">48 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">52 </td><td class="diffpresent"></td><td class="diffline">49 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">53 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​leave(chat_participan​t_ptr<span class="diffponct">·</span>​participant)​</td><td class="diffline">50 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​leave(chat_participan​t_ptr<span class="diffponct">·</span>​participant)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">54 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">51 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">55 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​participants_.​erase(participant)​;​</td><td class="diffline">52 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​participants_.​erase(participant)​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">56 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">53 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">57 </td><td class="diffpresent"></td><td class="diffline">54 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">58 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​deliver(const<span class="diffponct">·</span>​chat_message&<span class="diffponct">·</span>​msg)​</td><td class="diffline">55 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​deliver(const<span class="diffponct">·</span>​chat_message&<span class="diffponct">·</span>​msg)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">59 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">56 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">60 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​recent_msgs_.​push_back(msg)​;​</td><td class="diffline">57 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​recent_msgs_.​push_back(msg)​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">61 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​while<span class="diffponct">·</span>​(recent_msgs_.​size()​<span class="diffponct">·</span>​><span class="diffponct">·</span>​max_recent_msgs)​</td><td class="diffline">58 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​while<span class="diffponct">·</span>​(recent_msgs_.​size()​<span class="diffponct">·</span>​><span class="diffponct">·</span>​max_recent_msgs)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">62 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​recent_msgs_.​pop_front()​;​</td><td class="diffline">59 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​recent_msgs_.​pop_front()​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">63 </td><td class="diffpresent"></td><td class="diffline">60 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">64 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>for<span class="diffchanged2">_</span><span class="diffchanged2">e</span>a<span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">(</span>participant<span class="diffchanged2">s​</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">b</span><span class="diffchanged2">e</span><span class="diffchanged2">g</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​participants_<span class="diffchanged2">.​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span>)​<span class="diffchanged2">,​</span></td><td class="diffline">61 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​for<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">(</span>a<span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>participant<span class="diffchanged2">:​</span><span class="diffponct">·</span>​participants_)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">65 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span>participan​t<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>deliver<span class="diffchanged2">,​</span></td><td class="diffline">62 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​participant<span class="diffchanged2">-​</span><span class="diffchanged2">></span>deliver<span class="diffchanged2">(</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">66 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">_</span><span class="diffchanged2">1</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">f</span><span class="diffchanged2">(</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">67 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">63 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">68 </td><td class="diffpresent"></td><td class="diffline">64 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">69 </td><td class="diffpresent">private:​</td><td class="diffline">65 </td><td class="diffpresent">private:​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">70 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​set<chat_participant_​ptr><span class="diffponct">·</span>​participants_;​</td><td class="diffline">66 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​set<chat_participant_​ptr><span class="diffponct">·</span>​participants_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">71 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​enum<span class="diffponct">·</span>​{<span class="diffponct">·</span>​max_recent_msgs<span class="diffponct">·</span>​=<span class="diffponct">·</span>​100<span class="diffponct">·</span>​};​</td><td class="diffline">67 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​enum<span class="diffponct">·</span>​{<span class="diffponct">·</span>​max_recent_msgs<span class="diffponct">·</span>​=<span class="diffponct">·</span>​100<span class="diffponct">·</span>​};​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">72 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_message_queue<span class="diffponct">·</span>​recent_msgs_;​</td><td class="diffline">68 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_message_queue<span class="diffponct">·</span>​recent_msgs_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">73 </td><td class="diffpresent">};​</td><td class="diffline">69 </td><td class="diffpresent">};​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">74 </td><td class="diffpresent"></td><td class="diffline">70 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">75 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td><td class="diffline">71 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">76 </td><td class="diffpresent"></td><td class="diffline">72 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">77 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_session</td><td class="diffline">73 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_session</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">78 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​:​<span class="diffponct">·</span>​public<span class="diffponct">·</span>​chat_participant,​</td><td class="diffline">74 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​:​<span class="diffponct">·</span>​public<span class="diffponct">·</span>​chat_participant,​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">79 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​public<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span>st:​:​enable_shared_from_th​is<chat_session></td><td class="diffline">75 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​public<span class="diffponct">·</span>​st<span class="diffchanged2">d</span>:​:​enable_shared_from_th​is<chat_session></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">80 </td><td class="diffpresent">{</td><td class="diffline">76 </td><td class="diffpresent">{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">81 </td><td class="diffpresent">public:​</td><td class="diffline">77 </td><td class="diffpresent">public:​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">82 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_session(<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span>:​:​<span class="diffchanged2">i</span>o<span class="diffchanged2">_</span>c<span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span>e<span class="diffchanged2">x</span>t<span class="diffchanged2">&</span><span class="diffponct">·</span>​<span class="diffchanged2">i</span>o<span class="diffchanged2">_</span>c<span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span>e<span class="diffchanged2">x</span>t,​<span class="diffponct">·</span>​chat_room&<span class="diffponct">·</span>​room)​</td><td class="diffline">78 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_session(<span class="diffchanged2">t</span><span class="diffchanged2">c</span><span class="diffchanged2">p</span>:​:​<span class="diffchanged2">s</span>oc<span class="diffchanged2">k</span>et<span class="diffponct">·</span>​<span class="diffchanged2">s</span>oc<span class="diffchanged2">k</span>et,​<span class="diffponct">·</span>​chat_room&<span class="diffponct">·</span>​room)​</td></tr>
|
2023-10-25 13:08:15 -04:00
|
|
|
<tr class="diffchanged"><td class="diffline">83 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​:​<span class="diffponct">·</span>​local_socket(<span class="diffchanged2">i</span>o<span class="diffchanged2">_</span><span class="diffchanged2">c</span>o<span class="diffchanged2">n</span><span class="diffchanged2">t</span>e<span class="diffchanged2">x</span><span class="diffchanged2">t</span>)​,​</td><td class="diffline">79 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​:​<span class="diffponct">·</span>​local_socket(<span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">m</span>o<span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span>o<span class="diffchanged2">c</span><span class="diffchanged2">k</span>e<span class="diffchanged2">t</span><span class="diffchanged2">)​</span>)​,​</td></tr>
|
2023-10-24 21:59:30 -04:00
|
|
|
<tr class="diffunmodified"><td class="diffline">84 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_(room)​</td><td class="diffline">80 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_(room)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">85 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">81 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">86 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">82 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">87 </td><td class="diffpresent"></td><td class="diffline">83 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">88 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​tcp:​:​socket&<span class="diffponct">·</span>​socket()​</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">89 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td colspan="2"></td></tr>
|
2023-10-25 13:08:15 -04:00
|
|
|
<tr class="diffdeleted"><td class="diffline">90 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​local_socket;​</td><td colspan="2"></td></tr>
|
2023-10-24 21:59:30 -04:00
|
|
|
<tr class="diffdeleted"><td class="diffline">91 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">92 </td><td class="diffpresent"></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">93 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​start()​</td><td class="diffline">84 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​start()​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">94 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">85 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">95 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_.​join(shared_from_this​()​)​;​</td><td class="diffline">86 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_.​join(shared_from_this​()​)​;​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">96 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span>o<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span>_read<span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span>e<span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td><td class="diffline">87 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">d</span>o_read<span class="diffchanged2">_</span><span class="diffchanged2">h</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span>e<span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">97 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span><span class="diffchanged2">f</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">a</span><span class="diffchanged2">g</span><span class="diffchanged2">e</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">98 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">99 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">h</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">100 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">101 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">88 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">102 </td><td class="diffpresent"></td><td class="diffline">89 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">103 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​deliver(const<span class="diffponct">·</span>​chat_message&<span class="diffponct">·</span>​msg)​</td><td class="diffline">90 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​deliver(const<span class="diffponct">·</span>​chat_message&<span class="diffponct">·</span>​msg)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">104 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">91 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">105 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​bool<span class="diffponct">·</span>​write_in_progress<span class="diffponct">·</span>​=<span class="diffponct">·</span>​!write_msgs_.​empty()​;​</td><td class="diffline">92 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​bool<span class="diffponct">·</span>​write_in_progress<span class="diffponct">·</span>​=<span class="diffponct">·</span>​!write_msgs_.​empty()​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">106 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​write_msgs_.​push_back(msg)​;​</td><td class="diffline">93 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​write_msgs_.​push_back(msg)​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">107 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(!write_in_progress)​</td><td class="diffline">94 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(!write_in_progress)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">108 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">95 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">109 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span>o<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span>_write(<span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td><td class="diffline">96 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">d</span>o_write(<span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">110 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span><span class="diffchanged2">f</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">s</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">111 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">s</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">.​</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">112 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">113 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">114 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">97 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">115 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">98 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">116 </td><td class="diffpresent"></td><td class="diffline">99 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">117 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">v</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">d</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span>r<span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">h</span><span class="diffchanged2">e</span>a<span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">c</span><span class="diffchanged2">o​</span><span class="diffchanged2">n</span><span class="diffchanged2">s</span>t<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">&</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>e<span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span></td><td class="diffline">100 </td><td class="diffpresent"><span class="diffchanged2">p</span>r<span class="diffchanged2">i</span><span class="diffchanged2">v</span>ate<span class="diffchanged2">:​</span></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">101 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​do_read_header()​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">118 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">102 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">119 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">(</span><span class="diffchanged2">!</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">&</span><span class="diffchanged2">&</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>re<span class="diffchanged2">a</span>d<span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span>_<span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">c</span>o<span class="diffchanged2">d</span><span class="diffchanged2">e</span>_<span class="diffchanged2">h</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span>()​)​</td><td class="diffline">103 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">f</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span>red_<span class="diffchanged2">f</span><span class="diffchanged2">r</span>o<span class="diffchanged2">m</span>_<span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s​</span>()​)​<span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">120 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">104 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">121 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​asio:​:​as<span class="diffchanged2">y</span><span class="diffchanged2">n</span>c_<span class="diffchanged2">r</span>ead<span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span>t<span class="diffchanged2">_</span>,​</td><td class="diffline">105 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​asio:​:​<span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span><span class="diffchanged2">f</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span>a<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span>s<span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>c<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span>_<span class="diffchanged2">m</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">a</span><span class="diffchanged2">g</span><span class="diffchanged2">e</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span>ead<span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span>t<span class="diffchanged2">h</span><span class="diffchanged2">)​</span>,​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">122 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span>i<span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span>f<span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">b</span>od<span class="diffchanged2">y</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span>,​<span class="diffponct">·</span>​<span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span>d<span class="diffchanged2">_</span><span class="diffchanged2">m</span>s<span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">y</span><span class="diffchanged2">_</span>length<span class="diffchanged2">(</span><span class="diffchanged2">)​</span>)​<span class="diffchanged2">,​</span></td><td class="diffline">106 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">[</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span>i<span class="diffchanged2">s</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span>f<span class="diffchanged2">]</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span>od<span class="diffchanged2">e</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">c</span>,​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span>d<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>s<span class="diffchanged2">i</span><span class="diffchanged2">z</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">123 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">y</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span></td><td class="diffline">107 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">124 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span>a<span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span>de<span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>e<span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span>r<span class="diffchanged2">)​</span>)​<span class="diffchanged2">;​</span></td><td class="diffline">108 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffponct">·</span>​<span class="diffchanged2">(</span><span class="diffchanged2">!</span><span class="diffchanged2">e</span><span class="diffchanged2">c</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">&</span><span class="diffchanged2">&</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span>a<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span>de<span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">h</span>e<span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span>r<span class="diffchanged2">(</span>)​<span class="diffchanged2">)​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">125 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">109 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">126 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​e<span class="diffchanged2">l</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span></td><td class="diffline">110 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">d</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span>e<span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">y</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">127 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">111 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">128 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">v</span>e<span class="diffchanged2">(</span>s<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span>e<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i​</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td><td class="diffline">112 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>e<span class="diffchanged2">l</span>se</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">129 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">113 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">114 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_.​leave(shared_from_thi​s()​)​;​</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">115 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">116 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​})​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">130 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">117 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">131 </td><td class="diffpresent"></td><td class="diffline">118 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">132 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span>d<span class="diffchanged2">l</span><span class="diffchanged2">e</span>_read_body(<span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">s​</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">&</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span>)​</td><td class="diffline">119 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​d<span class="diffchanged2">o</span>_read_body()​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">133 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">120 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">134 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffponct">·</span>​(<span class="diffchanged2">!</span>e<span class="diffchanged2">r</span>ro<span class="diffchanged2">r</span>)​</td><td class="diffline">121 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">f</span>(<span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span>e<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span>ro<span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s​</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span>)​<span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">135 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">122 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">136 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​r<span class="diffchanged2">o</span><span class="diffchanged2">o</span>m_.​<span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">i</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span>read_msg_)​<span class="diffchanged2">;​</span></td><td class="diffline">123 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span><span class="diffchanged2">f</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span>r<span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span>m<span class="diffchanged2">s</span><span class="diffchanged2">g</span>_.​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">y</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>read_msg<span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">y</span>_<span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span>)​<span class="diffchanged2">,​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">137 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span>s<span class="diffchanged2">i</span><span class="diffchanged2">o</span>:​:​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span>c<span class="diffchanged2">_</span><span class="diffchanged2">r</span>e<span class="diffchanged2">a</span>d<span class="diffchanged2">(</span>s<span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span>et<span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td><td class="diffline">124 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">[</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">f</span><span class="diffchanged2">]</span><span class="diffchanged2">(</span>s<span class="diffchanged2">t</span><span class="diffchanged2">d</span>:​:​<span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span>c<span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>e<span class="diffchanged2">c</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span>d<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>s<span class="diffchanged2">i</span><span class="diffchanged2">z</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">/​</span><span class="diffchanged2">*</span><span class="diffchanged2">l</span>e<span class="diffchanged2">n</span><span class="diffchanged2">g</span>t<span class="diffchanged2">h</span><span class="diffchanged2">*</span><span class="diffchanged2">/​</span><span class="diffchanged2">)​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">138 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span><span class="diffchanged2">f</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">a</span><span class="diffchanged2">g</span><span class="diffchanged2">e</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span></td><td class="diffline">125 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">139 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span>i<span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">h</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span>e<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span>)​<span class="diffchanged2">,​</span></td><td class="diffline">126 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​i<span class="diffchanged2">f</span><span class="diffponct">·</span>​<span class="diffchanged2">(</span><span class="diffchanged2">!</span>e<span class="diffchanged2">c</span>)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">140 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td><td class="diffline">127 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">141 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">128 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">i</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">_</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">142 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​e<span class="diffchanged2">l</span><span class="diffchanged2">s</span>e</td><td class="diffline">129 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">d</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">h</span>e<span class="diffchanged2">a</span><span class="diffchanged2">d</span>e<span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">143 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">130 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">144 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">v</span>e<span class="diffchanged2">(</span>s<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span>e<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i​</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td><td class="diffline">131 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>e<span class="diffchanged2">l</span>se</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">145 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">132 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">133 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_.​leave(shared_from_thi​s()​)​;​</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">134 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">135 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​})​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">146 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">136 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">147 </td><td class="diffpresent"></td><td class="diffline">137 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">148 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span>d<span class="diffchanged2">l</span><span class="diffchanged2">e</span>_write(<span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">&</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span>)​</td><td class="diffline">138 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​d<span class="diffchanged2">o</span>_write()​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">149 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">139 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">150 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffponct">·</span>​(<span class="diffchanged2">!</span>e<span class="diffchanged2">r</span>ro<span class="diffchanged2">r</span>)​</td><td class="diffline">140 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">u</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">f</span>(<span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span>e<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span>ro<span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s​</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span>)​<span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">151 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">141 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span><span class="diffchanged2">_</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">152 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​write_msgs_.​<span class="diffchanged2">p</span>o<span class="diffchanged2">p</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span>t()​<span class="diffchanged2">;​</span></td><td class="diffline">142 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span><span class="diffchanged2">f</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span>write_msgs_.​<span class="diffchanged2">f</span><span class="diffchanged2">r</span>o<span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">a</span>t<span class="diffchanged2">a</span>()​<span class="diffchanged2">,​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">153 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffponct">·</span>​<span class="diffchanged2">(</span><span class="diffchanged2">!</span>write_msgs_.​e<span class="diffchanged2">m</span><span class="diffchanged2">p</span>t<span class="diffchanged2">y</span>()​)​</td><td class="diffline">143 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>write_msgs_<span class="diffchanged2">.​</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span>.​<span class="diffchanged2">l</span>e<span class="diffchanged2">n</span><span class="diffchanged2">g</span>t<span class="diffchanged2">h</span>()​)​<span class="diffchanged2">,​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">154 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">144 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">[</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">f</span><span class="diffchanged2">]</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffponct">·</span>​<span class="diffchanged2">e</span><span class="diffchanged2">c</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">z</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffponct">·</span>​<span class="diffchanged2">/​</span><span class="diffchanged2">*</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">*</span><span class="diffchanged2">/​</span><span class="diffchanged2">)​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">155 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span><span class="diffchanged2">_</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">,​</span></td><td class="diffline">145 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">156 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span>i<span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">u</span><span class="diffchanged2">f</span>f<span class="diffchanged2">e</span><span class="diffchanged2">r</span>(<span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span>e<span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">s</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">.​</span><span class="diffchanged2">d</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">(</span>)​<span class="diffchanged2">,​</span></td><td class="diffline">146 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffchanged2"><span class="diffponct">·</span>​</span>(<span class="diffchanged2">!</span>e<span class="diffchanged2">c</span>)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">157 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span><span class="diffchanged2">s</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">.​</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">g</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span></td><td class="diffline">147 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">158 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span>i<span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span>t<span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span>e_<span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>s<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">e</span><span class="diffchanged2">d</span>_fro<span class="diffchanged2">m</span><span class="diffchanged2">_</span>t<span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span>()​<span class="diffchanged2">,​</span></td><td class="diffline">148 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">w</span><span class="diffchanged2">r</span>ite_<span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span>s<span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">p</span>_fro<span class="diffchanged2">n</span>t()​<span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">159 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span>i<span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span>s<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>e<span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span>)​<span class="diffchanged2">;​</span></td><td class="diffline">149 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​i<span class="diffchanged2">f</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">(</span><span class="diffchanged2">!</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">m</span><span class="diffchanged2">s</span><span class="diffchanged2">g</span>s<span class="diffchanged2">_</span><span class="diffchanged2">.​</span>e<span class="diffchanged2">m</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">y</span><span class="diffchanged2">(</span>)​<span class="diffchanged2">)​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">160 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">150 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">161 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">151 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">d</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span><span class="diffchanged2">w</span><span class="diffchanged2">r</span><span class="diffchanged2">i</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">162 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">e</span><span class="diffchanged2">l</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span></td><td class="diffline">152 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">}</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">163 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td><td class="diffline">153 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">164 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">a</span><span class="diffchanged2">v</span>e<span class="diffchanged2">(</span>s<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span>e<span class="diffchanged2">d</span><span class="diffchanged2">_</span><span class="diffchanged2">f</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i​</span><span class="diffchanged2">s</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td><td class="diffline">154 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>e<span class="diffchanged2">l</span>se</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">165 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">155 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">156 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​room_.​leave(shared_from_thi​s()​)​;​</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">157 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">158 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​})​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">166 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">159 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">167 </td><td class="diffpresent"></td><td class="diffline">160 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">168 </td><td class="diffpresent">private:​</td><td colspan="2"></td></tr>
|
2023-10-25 13:08:15 -04:00
|
|
|
<tr class="diffunmodified"><td class="diffline">169 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​tcp:​:​socket<span class="diffponct">·</span>​local_socket;​</td><td class="diffline">161 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​tcp:​:​socket<span class="diffponct">·</span>​local_socket;​</td></tr>
|
2023-10-24 21:59:30 -04:00
|
|
|
<tr class="diffunmodified"><td class="diffline">170 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_room&<span class="diffponct">·</span>​room_;​</td><td class="diffline">162 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_room&<span class="diffponct">·</span>​room_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">171 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_message<span class="diffponct">·</span>​read_msg_;​</td><td class="diffline">163 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_message<span class="diffponct">·</span>​read_msg_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">172 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_message_queue<span class="diffponct">·</span>​write_msgs_;​</td><td class="diffline">164 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_message_queue<span class="diffponct">·</span>​write_msgs_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">173 </td><td class="diffpresent">};​</td><td class="diffline">165 </td><td class="diffpresent">};​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">174 </td><td class="diffpresent"></td><td class="diffline">166 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">175 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​boost:​:​shared_ptr<chat_sessi​on><span class="diffponct">·</span>​chat_session_ptr;​</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">176 </td><td class="diffpresent"></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">177 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td><td class="diffline">167 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">178 </td><td class="diffpresent"></td><td class="diffline">168 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">179 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_server</td><td class="diffline">169 </td><td class="diffpresent">class<span class="diffponct">·</span>​chat_server</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">180 </td><td class="diffpresent">{</td><td class="diffline">170 </td><td class="diffpresent">{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">181 </td><td class="diffpresent">public:​</td><td class="diffline">171 </td><td class="diffpresent">public:​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">182 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_server(asio:​:​io_context&<span class="diffponct">·</span>​io_context,​</td><td class="diffline">172 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_server(asio:​:​io_context&<span class="diffponct">·</span>​io_context,​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">183 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​const<span class="diffponct">·</span>​tcp:​:​endpoint&<span class="diffponct">·</span>​endpoint)​</td><td class="diffline">173 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​const<span class="diffponct">·</span>​tcp:​:​endpoint&<span class="diffponct">·</span>​endpoint)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">184 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​:​<span class="diffponct">·</span>​<span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span>c<span class="diffchanged2">o</span><span class="diffchanged2">n</span>t<span class="diffchanged2">e</span><span class="diffchanged2">x</span><span class="diffchanged2">t</span>_(io_contex​t<span class="diffchanged2">)​</span><span class="diffchanged2">,​</span></td><td class="diffline">174 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​:​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">c</span>c<span class="diffchanged2">e</span><span class="diffchanged2">p</span>t<span class="diffchanged2">o</span><span class="diffchanged2">r</span>_(io_context<span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">)​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">185 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">(</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">x</span><span class="diffchanged2">t</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">)​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">186 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">175 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">187 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">t</span>_accept()​;​</td><td class="diffline">176 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">d</span><span class="diffchanged2">o</span>_accept()​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">188 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">177 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">189 </td><td class="diffpresent"></td><td class="diffline">178 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">190 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">v</span><span class="diffchanged2">o</span>i<span class="diffchanged2">d</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span>a<span class="diffchanged2">r</span>t<span class="diffchanged2">_</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">c</span>e<span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span></td><td class="diffline">179 </td><td class="diffpresent"><span class="diffchanged2">p</span><span class="diffchanged2">r</span>i<span class="diffchanged2">v</span>ate<span class="diffchanged2">:​</span></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">180 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​void<span class="diffponct">·</span>​do_accept()​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">191 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">181 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">192 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">c</span><span class="diffchanged2">h</span>a<span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span>e<span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">_</span>pt<span class="diffchanged2">r</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">n</span><span class="diffchanged2">e</span><span class="diffchanged2">w</span>_<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span>s<span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">(</span>n<span class="diffchanged2">e</span><span class="diffchanged2">w</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>c<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span>_<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">(</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span>c<span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span>e​<span class="diffchanged2">x</span>t<span class="diffchanged2">_</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">m</span><span class="diffchanged2">_</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td><td class="diffline">182 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​a<span class="diffchanged2">c</span><span class="diffchanged2">c</span>ept<span class="diffchanged2">o</span><span class="diffchanged2">r</span>_<span class="diffchanged2">.​</span><span class="diffchanged2">a</span>s<span class="diffchanged2">y</span>nc_<span class="diffchanged2">a</span>c<span class="diffchanged2">c</span>e<span class="diffchanged2">p</span>t<span class="diffchanged2">(</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">193 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">p</span>t<span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">.​</span><span class="diffchanged2">a</span>s<span class="diffchanged2">y</span><span class="diffchanged2">n</span><span class="diffchanged2">c</span>_<span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">c</span>e<span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">n</span><span class="diffchanged2">e</span><span class="diffchanged2">w</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span>s<span class="diffchanged2">s​</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">-​</span><span class="diffchanged2">></span>socket<span class="diffchanged2">(</span>)​<span class="diffchanged2">,​</span></td><td class="diffline">183 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">[</span>t<span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">]</span><span class="diffchanged2">(</span>s<span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span>_<span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span>e<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">c</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">t</span><span class="diffchanged2">c</span><span class="diffchanged2">p</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>s<span class="diffchanged2">o</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">e</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>socket)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">194 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">b</span><span class="diffchanged2">o</span><span class="diffchanged2">o</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">b</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">(</span><span class="diffchanged2">&</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">l</span><span class="diffchanged2">e</span><span class="diffchanged2">_</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">t</span><span class="diffchanged2">h</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​<span class="diffchanged2">n</span><span class="diffchanged2">e</span><span class="diffchanged2">w</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">,​</span></td><td class="diffline">184 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">195 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span>i<span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">h</span><span class="diffchanged2">o</span><span class="diffchanged2">l</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span>e<span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span>)​<span class="diffchanged2">;​</span></td><td class="diffline">185 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​i<span class="diffchanged2">f</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">(</span><span class="diffchanged2">!</span>e<span class="diffchanged2">c</span>)​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">196 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span></td><td class="diffline">186 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">{</span></td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">187 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​make_shared<chat_sess​ion>(std:​:​move(socket)​,​<span class="diffponct">·</span>​room_)​-​>start()​;​</td></tr>
|
|
|
|
|
<tr class="diffadded"><td colspan="2"> </td><td class="diffline">188 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">197 </td><td class="diffpresent"></td><td class="diffline">189 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">198 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">v</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">d</span><span class="diffponct">·</span>​<span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">n</span>d<span class="diffchanged2">l</span><span class="diffchanged2">e</span>_accept(<span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e​</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">_</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">r</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">,​</span></td><td class="diffline">190 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffponct">·</span>​<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>d<span class="diffchanged2">o</span>_accept(<span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">199 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">d</span><span class="diffchanged2">e</span><span class="diffchanged2">&</span><span class="diffponct">·</span>​<span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span></td><td class="diffline">191 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">}</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">200 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">{</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">201 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">i</span><span class="diffchanged2">f</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">(</span><span class="diffchanged2">!</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">r</span><span class="diffchanged2">o</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">202 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">{</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">203 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span><span class="diffchanged2">s</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">-​</span><span class="diffchanged2">></span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">204 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">}</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">205 </td><td class="diffpresent"><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">206 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">207 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">192 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">208 </td><td class="diffpresent"></td><td class="diffline">193 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">209 </td><td class="diffpresent">private:​</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">210 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​asio:​:​io_context&<span class="diffponct">·</span>​io_context_;​</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">211 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​tcp:​:​acceptor<span class="diffponct">·</span>​acceptor_;​</td><td class="diffline">194 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​tcp:​:​acceptor<span class="diffponct">·</span>​acceptor_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">212 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_room<span class="diffponct">·</span>​room_;​</td><td class="diffline">195 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_room<span class="diffponct">·</span>​room_;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">213 </td><td class="diffpresent">};​</td><td class="diffline">196 </td><td class="diffpresent">};​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">214 </td><td class="diffpresent"></td><td class="diffline">197 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">215 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​boost:​:​shared_ptr<chat_serve​r><span class="diffponct">·</span>​chat_server_ptr;​</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">216 </td><td class="diffpresent">typedef<span class="diffponct">·</span>​std:​:​list<chat_server_ptr>​<span class="diffponct">·</span>​chat_server_list;​</td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffdeleted"><td class="diffline">217 </td><td class="diffpresent"></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">218 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td><td class="diffline">198 </td><td class="diffpresent">/​/​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​-​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">219 </td><td class="diffpresent"></td><td class="diffline">199 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">220 </td><td class="diffpresent">int<span class="diffponct">·</span>​main(int<span class="diffponct">·</span>​argc,​<span class="diffponct">·</span>​char*<span class="diffponct">·</span>​argv[])​</td><td class="diffline">200 </td><td class="diffpresent">int<span class="diffponct">·</span>​main(int<span class="diffponct">·</span>​argc,​<span class="diffponct">·</span>​char*<span class="diffponct">·</span>​argv[])​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">221 </td><td class="diffpresent">{</td><td class="diffline">201 </td><td class="diffpresent">{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">222 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​try</td><td class="diffline">202 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​try</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">223 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">203 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">224 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(argc<span class="diffponct">·</span>​<<span class="diffponct">·</span>​2)​</td><td class="diffline">204 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​if<span class="diffponct">·</span>​(argc<span class="diffponct">·</span>​<<span class="diffponct">·</span>​2)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">225 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">205 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">226 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Usage:​<span class="diffponct">·</span>​chat_server<span class="diffponct">·</span>​<port><span class="diffponct">·</span>​[<port><span class="diffponct">·</span>​.​.​.​]\n";​</td><td class="diffline">206 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Usage:​<span class="diffponct">·</span>​chat_server<span class="diffponct">·</span>​<port><span class="diffponct">·</span>​[<port><span class="diffponct">·</span>​.​.​.​]\n";​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">227 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​1;​</td><td class="diffline">207 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​1;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">228 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">208 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">229 </td><td class="diffpresent"></td><td class="diffline">209 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">230 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​asio:​:​io_context<span class="diffponct">·</span>​io_context;​</td><td class="diffline">210 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​asio:​:​io_context<span class="diffponct">·</span>​io_context;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">231 </td><td class="diffpresent"></td><td class="diffline">211 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">232 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​chat_server<span class="diffchanged2">_</span><span class="diffchanged2">l</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffponct">·</span>​servers;​</td><td class="diffline">212 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2">d</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">l</span><span class="diffchanged2">i</span><span class="diffchanged2">s</span><span class="diffchanged2">t</span><span class="diffchanged2"><</span>chat_server<span class="diffchanged2">></span><span class="diffponct">·</span>​servers;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">233 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​for<span class="diffponct">·</span>​(int<span class="diffponct">·</span>​i<span class="diffponct">·</span>​=<span class="diffponct">·</span>​1;​<span class="diffponct">·</span>​i<span class="diffponct">·</span>​<<span class="diffponct">·</span>​argc;​<span class="diffponct">·</span>​++i)​</td><td class="diffline">213 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​for<span class="diffponct">·</span>​(int<span class="diffponct">·</span>​i<span class="diffponct">·</span>​=<span class="diffponct">·</span>​1;​<span class="diffponct">·</span>​i<span class="diffponct">·</span>​<<span class="diffponct">·</span>​argc;​<span class="diffponct">·</span>​++i)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">234 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">214 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">235 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">u</span><span class="diffchanged2">s</span>in<span class="diffchanged2">g</span><span class="diffponct">·</span>​n<span class="diffchanged2">a</span><span class="diffchanged2">m</span><span class="diffchanged2">e</span><span class="diffchanged2">s</span>p<span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">e</span><span class="diffponct">·</span>​std<span class="diffchanged2">;​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">/​</span><span class="diffchanged2">/​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">F</span><span class="diffchanged2">o</span>r<span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">.​</span></td><td class="diffline">215 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">t</span><span class="diffchanged2">c</span><span class="diffchanged2">p</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span>in<span class="diffchanged2">t</span><span class="diffponct">·</span>​<span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span>n<span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">t</span><span class="diffchanged2">c</span>p<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">v</span><span class="diffchanged2">4</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span><span class="diffchanged2">,​</span><span class="diffponct">·</span>​std<span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">(</span><span class="diffchanged2">a</span>r<span class="diffchanged2">g</span><span class="diffchanged2">v</span><span class="diffchanged2">[</span><span class="diffchanged2">i</span><span class="diffchanged2">]</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">236 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">t</span><span class="diffchanged2">c</span><span class="diffchanged2">p</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2"><span class="diffponct">·</span>​</span>e<span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">(</span><span class="diffchanged2">t</span>c<span class="diffchanged2">p</span><span class="diffchanged2">:​</span><span class="diffchanged2">:​</span><span class="diffchanged2">v</span><span class="diffchanged2">4</span><span class="diffchanged2">(</span><span class="diffchanged2">)​</span>,​<span class="diffponct">·</span>​<span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">(</span><span class="diffchanged2">a</span><span class="diffchanged2">r</span><span class="diffchanged2">g</span><span class="diffchanged2">v</span><span class="diffchanged2">[</span>i<span class="diffchanged2">]</span><span class="diffchanged2">)​</span>)​;​</td><td class="diffline">216 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">.​</span><span class="diffchanged2">e</span><span class="diffchanged2">m</span><span class="diffchanged2">p</span><span class="diffchanged2">l</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span>e<span class="diffchanged2">_</span><span class="diffchanged2">b</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">(</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span>c<span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">e​</span><span class="diffchanged2">x</span><span class="diffchanged2">t</span>,​<span class="diffponct">·</span>​<span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span>i<span class="diffchanged2">n</span><span class="diffchanged2">t</span>)​;​</td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">237 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">_</span><span class="diffchanged2">p</span><span class="diffchanged2">t</span><span class="diffchanged2">r</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">n</span><span class="diffchanged2">e</span><span class="diffchanged2">w</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">c</span><span class="diffchanged2">h</span><span class="diffchanged2">a</span><span class="diffchanged2">t</span><span class="diffchanged2">_</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">(</span><span class="diffchanged2">i</span><span class="diffchanged2">o</span><span class="diffchanged2">_</span><span class="diffchanged2">c</span><span class="diffchanged2">o</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">e</span><span class="diffchanged2">x​</span><span class="diffchanged2">t</span><span class="diffchanged2">,​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">e</span><span class="diffchanged2">n</span><span class="diffchanged2">d</span><span class="diffchanged2">p</span><span class="diffchanged2">o</span><span class="diffchanged2">i</span><span class="diffchanged2">n</span><span class="diffchanged2">t</span><span class="diffchanged2">)​</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffchanged"><td class="diffline">238 </td><td class="diffpresent"><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2"><span class="diffponct">·</span>​</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">s</span><span class="diffchanged2">.​</span><span class="diffchanged2">p</span><span class="diffchanged2">u</span><span class="diffchanged2">s</span><span class="diffchanged2">h</span><span class="diffchanged2">_</span><span class="diffchanged2">b</span><span class="diffchanged2">a</span><span class="diffchanged2">c</span><span class="diffchanged2">k</span><span class="diffchanged2">(</span><span class="diffchanged2">s</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">v</span><span class="diffchanged2">e</span><span class="diffchanged2">r</span><span class="diffchanged2">)​</span><span class="diffchanged2">;​</span><span class="diffchanged2"></span></td><td colspan="2"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">239 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">217 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">240 </td><td class="diffpresent"></td><td class="diffline">218 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">241 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​io_context.​run()​;​</td><td class="diffline">219 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​io_context.​run()​;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">242 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">220 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">243 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​catch<span class="diffponct">·</span>​(std:​:​exception&<span class="diffponct">·</span>​e)​</td><td class="diffline">221 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​catch<span class="diffponct">·</span>​(std:​:​exception&<span class="diffponct">·</span>​e)​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">244 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td><td class="diffline">222 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​{</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">245 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Exception:​<span class="diffponct">·</span>​"<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​e.​what()​<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"\n";​</td><td class="diffline">223 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​<span class="diffponct">·</span>​std:​:​cerr<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"Exception:​<span class="diffponct">·</span>​"<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​e.​what()​<span class="diffponct">·</span>​<<<span class="diffponct">·</span>​"\n";​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">246 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td><td class="diffline">224 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​}</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">247 </td><td class="diffpresent"></td><td class="diffline">225 </td><td class="diffpresent"></td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">248 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​0;​</td><td class="diffline">226 </td><td class="diffpresent"><span class="diffponct">·</span>​<span class="diffponct">·</span>​return<span class="diffponct">·</span>​0;​</td></tr>
|
|
|
|
|
<tr class="diffunmodified"><td class="diffline">249 </td><td class="diffpresent">}</td><td class="diffline">227 </td><td class="diffpresent">}</td></tr>
|
|
|
|
|
|
|
|
|
|
</table>
|
|
|
|
|
|
|
|
|
|
<footer>
|
|
|
|
|
<p>Modified at 30.07.2023. HTML formatting created by <a href="http://git.droids-corp.org/gitweb/?p=diff2html;a=summary">diff2html</a>. </p>
|
|
|
|
|
</footer>
|
|
|
|
|
</body></html>
|
