Skip to content

Commit 70b4168

Browse files
SortlandSortland
committed
latest hermes features implemented
1 parent 30e3b5d commit 70b4168

29 files changed

+4631
-114
lines changed

‎.gitignore

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,3 +535,34 @@ __pycache__/
535535
/References/pugixml/pugixml.cpp
536536
/References/pugixml/pugiconfig.hpp
537537
/tmp/Hermes_Debug_x86
538+
/References/lib32
539+
/References/lib64
540+
/References/boost/winapi
541+
/References/boost/stacktrace.hpp
542+
/References/boost/stacktrace
543+
/References/boost/qvm
544+
/References/boost/process.hpp
545+
/References/boost/process
546+
/References/boost/poly_collection
547+
/References/boost/operators_v1.hpp
548+
/References/boost/mp11.hpp
549+
/References/boost/mp11
550+
/References/boost/metaparse.hpp
551+
/References/boost/metaparse
552+
/References/boost/hof.hpp
553+
/References/boost/hof
554+
/References/boost/hana.hpp
555+
/References/boost/hana
556+
/References/boost/fiber
557+
/References/boost/dll.hpp
558+
/References/boost/dll
559+
/References/boost/contract_macro.hpp
560+
/References/boost/contract.hpp
561+
/References/boost/contract
562+
/References/boost/container_hash
563+
/References/boost/compute.hpp
564+
/References/boost/compute
565+
/References/boost/callable_traits.hpp
566+
/References/boost/callable_traits
567+
/References/boost/beast.hpp
568+
/References/boost/beast

‎src/Hermes/ConfigurationService.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ struct HermesConfigurationService : IAcceptorCallback, IConfigurationServiceSess
172172
HermesGetConfigurationData apiData = ToC(data);
173173

174174
CallbackScope<IGetConfigurationResponse> scope(m_pGetConfigurationResponder, responder);
175-
m_getConfigurationCallback(sessionId, &apiConnectionInfo, &apiData);
175+
m_getConfigurationCallback(sessionId, &apiData, &apiConnectionInfo);
176176
}
177177

178178
virtual void OnSet(unsigned sessionId, const ConnectionInfo& connectionInfo,
@@ -182,7 +182,7 @@ struct HermesConfigurationService : IAcceptorCallback, IConfigurationServiceSess
182182
auto apiConfiguration = ToC(configuration);
183183

184184
CallbackScope<ISetConfigurationResponse> scope(m_pSetConfigurationResponder, responder);
185-
m_setConfigurationCallback(sessionId, &apiConnectionInfo, &apiConfiguration);
185+
m_setConfigurationCallback(sessionId, &apiConfiguration, &apiConnectionInfo);
186186
}
187187

188188
virtual void OnDisconnected(unsigned sessionId, const Error& error) override

‎src/Hermes/GeneratedHermesGuid.cpp

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/Hermes/Hermes.vcxproj

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<SccProvider>SAK</SccProvider>
2727
<Keyword>Win32Proj</Keyword>
2828
<RootNamespace>Hermes</RootNamespace>
29-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
29+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3232
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -101,12 +101,13 @@
101101
<PreprocessorDefinitions>HERMES_LIB;_DEBUG;_WINDOWS;_USRDLL;HERMES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
102102
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\References; $(ProjectDir)\..\include</AdditionalIncludeDirectories>
103103
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
104+
<AdditionalOptions>/Zc:threadSafeInit-</AdditionalOptions>
104105
</ClCompile>
105106
<Link>
106107
<SubSystem>Windows</SubSystem>
107108
<GenerateDebugInformation>true</GenerateDebugInformation>
108109
<ImportLibrary>$(ProjectDir)\..\..\lib\$(Configuration)\$(PlatformTarget)\$(TargetName).lib</ImportLibrary>
109-
<AdditionalLibraryDirectories>..\..\References\static_runtime_libs.$(Configuration).$(PlatformTarget)\</AdditionalLibraryDirectories>
110+
<AdditionalLibraryDirectories>..\..\References\lib32</AdditionalLibraryDirectories>
110111
</Link>
111112
<BuildLog />
112113
</ItemDefinitionGroup>
@@ -118,12 +119,13 @@
118119
<PreprocessorDefinitions>HERMES_LIB;_DEBUG;_WINDOWS;_USRDLL;HERMES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119120
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\References; $(ProjectDir)\..\include</AdditionalIncludeDirectories>
120121
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
122+
<AdditionalOptions>/Zc:threadSafeInit-</AdditionalOptions>
121123
</ClCompile>
122124
<Link>
123125
<SubSystem>Windows</SubSystem>
124126
<GenerateDebugInformation>true</GenerateDebugInformation>
125127
<ImportLibrary>$(ProjectDir)\..\..\lib\$(Configuration)\$(PlatformTarget)\$(TargetName).lib</ImportLibrary>
126-
<AdditionalLibraryDirectories>..\..\References\static_runtime_libs.$(Configuration).$(PlatformTarget)\</AdditionalLibraryDirectories>
128+
<AdditionalLibraryDirectories>..\..\References\lib64</AdditionalLibraryDirectories>
127129
</Link>
128130
</ItemDefinitionGroup>
129131
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -134,14 +136,15 @@
134136
<PreprocessorDefinitions>HERMES_LIB;NDEBUG;_WINDOWS;_USRDLL;HERMES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135137
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\References; $(ProjectDir)\..\include</AdditionalIncludeDirectories>
136138
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
139+
<AdditionalOptions>/Zc:threadSafeInit-</AdditionalOptions>
137140
</ClCompile>
138141
<Link>
139142
<SubSystem>Windows</SubSystem>
140143
<EnableCOMDATFolding>true</EnableCOMDATFolding>
141144
<OptimizeReferences>true</OptimizeReferences>
142145
<GenerateDebugInformation>true</GenerateDebugInformation>
143146
<ImportLibrary>$(ProjectDir)\..\..\lib\$(Configuration)\$(PlatformTarget)\$(TargetName).lib</ImportLibrary>
144-
<AdditionalLibraryDirectories>..\..\References\static_runtime_libs.$(Configuration).$(PlatformTarget)\</AdditionalLibraryDirectories>
147+
<AdditionalLibraryDirectories>..\..\References\lib32</AdditionalLibraryDirectories>
145148
</Link>
146149
<BuildLog />
147150
</ItemDefinitionGroup>
@@ -154,14 +157,15 @@
154157
<PreprocessorDefinitions>HERMES_LIB;NDEBUG;_WINDOWS;_USRDLL;HERMES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155158
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\References; $(ProjectDir)\..\include</AdditionalIncludeDirectories>
156159
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
160+
<AdditionalOptions>/Zc:threadSafeInit-</AdditionalOptions>
157161
</ClCompile>
158162
<Link>
159163
<SubSystem>Windows</SubSystem>
160164
<EnableCOMDATFolding>true</EnableCOMDATFolding>
161165
<OptimizeReferences>true</OptimizeReferences>
162166
<GenerateDebugInformation>true</GenerateDebugInformation>
163167
<ImportLibrary>$(ProjectDir)\..\..\lib\$(Configuration)\$(PlatformTarget)\$(TargetName).lib</ImportLibrary>
164-
<AdditionalLibraryDirectories>..\..\References\static_runtime_libs.$(Configuration).$(PlatformTarget)\</AdditionalLibraryDirectories>
168+
<AdditionalLibraryDirectories>..\..\References\lib64</AdditionalLibraryDirectories>
165169
</Link>
166170
</ItemDefinitionGroup>
167171
<ItemGroup>
@@ -199,6 +203,10 @@
199203
<ClInclude Include="UpstreamSerializer.h" />
200204
<ClInclude Include="UpstreamSession.h" />
201205
<ClInclude Include="UpstreamStateMachine.h" />
206+
<ClInclude Include="VerticalClientSerializer.h" />
207+
<ClInclude Include="VerticalClientSession.h" />
208+
<ClInclude Include="VerticalServiceSerializer.h" />
209+
<ClInclude Include="VerticalServiceSession.h" />
202210
</ItemGroup>
203211
<ItemGroup>
204212
<ClCompile Include="..\..\References\pugixml\pugixml.cpp">
@@ -218,7 +226,6 @@
218226
<ClCompile Include="DownstreamSession.cpp" />
219227
<ClCompile Include="DownstreamSerializer.cpp" />
220228
<ClCompile Include="DownstreamStateMachine.cpp" />
221-
<ClCompile Include="GeneratedHermesGuid.cpp" />
222229
<ClCompile Include="MessageDispatcher.cpp" />
223230
<ClCompile Include="MessageSerialization.cpp" />
224231
<ClCompile Include="SenderEnvelope.cpp" />
@@ -233,16 +240,16 @@
233240
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
234241
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
235242
</ClCompile>
243+
<ClCompile Include="VerticalClient.cpp" />
244+
<ClCompile Include="VerticalClientSerializer.cpp" />
245+
<ClCompile Include="VerticalClientSession.cpp" />
246+
<ClCompile Include="VerticalService.cpp" />
247+
<ClCompile Include="VerticalServiceSerializer.cpp" />
248+
<ClCompile Include="VerticalServiceSession.cpp" />
236249
</ItemGroup>
237250
<ItemGroup>
238251
<ResourceCompile Include="..\..\version\Version.rc" />
239252
</ItemGroup>
240-
<ItemGroup>
241-
<None Include="..\..\README.md" />
242-
</ItemGroup>
243-
<ItemGroup>
244-
<Text Include="..\..\COPYRIGHT.txt" />
245-
</ItemGroup>
246253
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
247254
<ImportGroup Label="ExtensionTargets">
248255
</ImportGroup>

‎src/Hermes/Hermes.vcxproj.filters

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<Filter Include="Configuration">
3737
<UniqueIdentifier>{4035d6a8-f053-4d09-92f9-856f89ef72d0}</UniqueIdentifier>
3838
</Filter>
39+
<Filter Include="VerticalService">
40+
<UniqueIdentifier>{b1011605-5304-4521-bc19-57db95f24442}</UniqueIdentifier>
41+
</Filter>
42+
<Filter Include="VerticalClient">
43+
<UniqueIdentifier>{3a3fc53b-b1ec-4d42-9082-17db5afd9423}</UniqueIdentifier>
44+
</Filter>
3945
</ItemGroup>
4046
<ItemGroup>
4147
<ClInclude Include="stdafx.h">
@@ -140,6 +146,18 @@
140146
<ClInclude Include="MessageDispatcher.h">
141147
<Filter>Serialization</Filter>
142148
</ClInclude>
149+
<ClInclude Include="VerticalServiceSerializer.h">
150+
<Filter>VerticalService</Filter>
151+
</ClInclude>
152+
<ClInclude Include="VerticalServiceSession.h">
153+
<Filter>VerticalService</Filter>
154+
</ClInclude>
155+
<ClInclude Include="VerticalClientSerializer.h">
156+
<Filter>VerticalClient</Filter>
157+
</ClInclude>
158+
<ClInclude Include="VerticalClientSession.h">
159+
<Filter>VerticalClient</Filter>
160+
</ClInclude>
143161
</ItemGroup>
144162
<ItemGroup>
145163
<ClCompile Include="stdafx.cpp">
@@ -193,9 +211,6 @@
193211
<ClCompile Include="Serialization.cpp">
194212
<Filter>Serialization</Filter>
195213
</ClCompile>
196-
<ClCompile Include="GeneratedHermesGuid.cpp">
197-
<Filter>Infra</Filter>
198-
</ClCompile>
199214
<ClCompile Include="MessageSerialization.cpp">
200215
<Filter>Serialization</Filter>
201216
</ClCompile>
@@ -208,16 +223,28 @@
208223
<ClCompile Include="MessageDispatcher.cpp">
209224
<Filter>Serialization</Filter>
210225
</ClCompile>
226+
<ClCompile Include="VerticalServiceSerializer.cpp">
227+
<Filter>VerticalService</Filter>
228+
</ClCompile>
229+
<ClCompile Include="VerticalServiceSession.cpp">
230+
<Filter>VerticalService</Filter>
231+
</ClCompile>
232+
<ClCompile Include="VerticalService.cpp">
233+
<Filter>VerticalService</Filter>
234+
</ClCompile>
235+
<ClCompile Include="VerticalClientSerializer.cpp">
236+
<Filter>VerticalClient</Filter>
237+
</ClCompile>
238+
<ClCompile Include="VerticalClientSession.cpp">
239+
<Filter>VerticalClient</Filter>
240+
</ClCompile>
241+
<ClCompile Include="VerticalClient.cpp">
242+
<Filter>VerticalClient</Filter>
243+
</ClCompile>
211244
</ItemGroup>
212245
<ItemGroup>
213246
<ResourceCompile Include="..\..\version\Version.rc">
214247
<Filter>Resource Files</Filter>
215248
</ResourceCompile>
216249
</ItemGroup>
217-
<ItemGroup>
218-
<None Include="..\..\README.md" />
219-
</ItemGroup>
220-
<ItemGroup>
221-
<Text Include="..\..\COPYRIGHT.txt" />
222-
</ItemGroup>
223250
</Project>

‎src/Hermes/IService.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ limitations under the License.
2727

2828
namespace boost
2929
{
30-
namespace asio { class io_service; }
30+
namespace asio { class io_context; using io_service = io_context; }
3131
}
3232

3333

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy