Skip to content

Commit dd45047

Browse files
zhengshuxinzhengshuxin
committed
Merge branch 'master' of https://github.com/zhengshuxin/acl 
2 parents c559fd7 + e3a4eef commit dd45047

File tree

16 files changed

+251
-33
lines changed

16 files changed

+251
-33
lines changed

‎acl_cpp_vc2003.sln‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,13 +508,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "http_aio", "lib_protocol\sa
508508
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
509509
EndProjectSection
510510
EndProject
511+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_client", "lib_acl_cpp\samples\disque\disque_client\disque_client_vc2003.vcproj", "{2DABFAD1-114B-4F96-9185-DC0C56A3662D}"
512+
ProjectSection(ProjectDependencies) = postProject
513+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
514+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
515+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
516+
EndProjectSection
517+
EndProject
518+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_cluster", "lib_acl_cpp\samples\disque\disque_cluster\disque_cluster_vc2003.vcproj", "{2DABFAD1-114B-4F96-9185-DC0C56A3662D}"
519+
ProjectSection(ProjectDependencies) = postProject
520+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
521+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
522+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
523+
EndProjectSection
524+
EndProject
525+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_manager", "lib_acl_cpp\samples\disque\disque_manager\disque_manager_vc2003.vcproj", "{2DABFAD1-114B-4F96-9185-DC0C56A3662D}"
526+
ProjectSection(ProjectDependencies) = postProject
527+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
528+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
529+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
530+
EndProjectSection
531+
EndProject
532+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "disque_pool", "lib_acl_cpp\samples\disque\disque_pool\disque_pool_vc2003.vcproj", "{2DABFAD1-114B-4F96-9185-DC0C56A3662D}"
533+
ProjectSection(ProjectDependencies) = postProject
534+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
535+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
536+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
537+
EndProjectSection
538+
EndProject
511539
Global
512540
GlobalSection(SolutionConfiguration) = preSolution
513541
Debug = Debug
514542
DebugDll = DebugDll
515543
Release = Release
516544
Releasedll = Releasedll
517545
EndGlobalSection
546+
GlobalSection(ProjectDependencies) = postSolution
547+
EndGlobalSection
518548
GlobalSection(ProjectConfiguration) = postSolution
519549
{41FA5224-3315-4CDA-9C44-19085049F179}.Debug.ActiveCfg = Debug|Win32
520550
{41FA5224-3315-4CDA-9C44-19085049F179}.Debug.Build.0 = Debug|Win32
@@ -1164,6 +1194,38 @@ Global
11641194
{0ED6281F-980A-47F7-B30B-0425EEB4C2A9}.Release.Build.0 = Release|Win32
11651195
{0ED6281F-980A-47F7-B30B-0425EEB4C2A9}.Releasedll.ActiveCfg = ReleaseDll|Win32
11661196
{0ED6281F-980A-47F7-B30B-0425EEB4C2A9}.Releasedll.Build.0 = ReleaseDll|Win32
1197+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.ActiveCfg = Debug|Win32
1198+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.Build.0 = Debug|Win32
1199+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.ActiveCfg = DebugDll|Win32
1200+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.Build.0 = DebugDll|Win32
1201+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.ActiveCfg = Release|Win32
1202+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.Build.0 = Release|Win32
1203+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.ActiveCfg = Releasedll|Win32
1204+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.Build.0 = Releasedll|Win32
1205+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.ActiveCfg = Debug|Win32
1206+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.Build.0 = Debug|Win32
1207+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.ActiveCfg = DebugDll|Win32
1208+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.Build.0 = DebugDll|Win32
1209+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.ActiveCfg = Release|Win32
1210+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.Build.0 = Release|Win32
1211+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.ActiveCfg = Releasedll|Win32
1212+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.Build.0 = Releasedll|Win32
1213+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.ActiveCfg = Debug|Win32
1214+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.Build.0 = Debug|Win32
1215+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.ActiveCfg = DebugDll|Win32
1216+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.Build.0 = DebugDll|Win32
1217+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.ActiveCfg = Release|Win32
1218+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.Build.0 = Release|Win32
1219+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.ActiveCfg = Releasedll|Win32
1220+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.Build.0 = Releasedll|Win32
1221+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.ActiveCfg = Debug|Win32
1222+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Debug.Build.0 = Debug|Win32
1223+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.ActiveCfg = DebugDll|Win32
1224+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.DebugDll.Build.0 = DebugDll|Win32
1225+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.ActiveCfg = Release|Win32
1226+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Release.Build.0 = Release|Win32
1227+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.ActiveCfg = Releasedll|Win32
1228+
{2DABFAD1-114B-4F96-9185-DC0C56A3662D}.Releasedll.Build.0 = Releasedll|Win32
11671229
EndGlobalSection
11681230
GlobalSection(ExtensibilityGlobals) = postSolution
11691231
EndGlobalSection

‎lib_acl_cpp/include/acl_cpp/http/HttpServletResponse.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class ACL_CPP_API HttpServletResponse
154154
* 向客户端发送 HTTP 数据体响应数据，可以循环调用此函数，该函数
155155
* 内部调用 HttpServletResponse::write(const void*, size_t) 过程，
156156
* 另外，在使用 chunked 方式传输数据时，应该应该最后再调用一次本函数，
157-
* 且参数均设为 0 表示数据结束
157+
* 且输入空串，即 buf.empty() == true
158158
* @param buf {const string&} 数据缓冲区
159159
* @return {bool} 发送是否成功，如果返回 false 表示连接中断
160160
*/

‎lib_acl_cpp/lib_acl_cpp_vc2003.vcproj‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Name="VCCLCompilerTool"
2222
Optimization="0"
2323
AdditionalIncludeDirectories=".\include;..\lib_protocol\include;..\lib_acl\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include"
24-
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_WIN_ICONV;HAS_SQLITE"
24+
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_WIN_ICONV"
2525
MinimalRebuild="TRUE"
2626
BasicRuntimeChecks="3"
2727
RuntimeLibrary="1"
@@ -69,7 +69,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
6969
<Tool
7070
Name="VCCLCompilerTool"
7171
AdditionalIncludeDirectories=".\include;..\lib_protocol\include;..\lib_acl\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include"
72-
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WIN_ICONV;HAS_SQLITE"
72+
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WIN_ICONV"
7373
RuntimeLibrary="0"
7474
UsePrecompiledHeader="3"
7575
PrecompiledHeaderThrough="acl_stdafx.hpp"
@@ -115,7 +115,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
115115
Name="VCCLCompilerTool"
116116
Optimization="0"
117117
AdditionalIncludeDirectories=".\include;..\lib_protocol\include;..\lib_acl\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include"
118-
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;HAS_SQLITE"
118+
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV"
119119
MinimalRebuild="FALSE"
120120
BasicRuntimeChecks="3"
121121
RuntimeLibrary="3"
@@ -181,7 +181,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
181181
Name="VCCLCompilerTool"
182182
Optimization="0"
183183
AdditionalIncludeDirectories=".\include;..\lib_protocol\include;..\lib_acl\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include"
184-
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;HAS_SQLITE"
184+
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV"
185185
MinimalRebuild="TRUE"
186186
BasicRuntimeChecks="3"
187187
RuntimeLibrary="2"
@@ -781,6 +781,9 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
781781
<File
782782
RelativePath=".\src\redis\redis_set.cpp">
783783
</File>
784+
<File
785+
RelativePath=".\src\redis\redis_slot.cpp">
786+
</File>
784787
<File
785788
RelativePath=".\src\redis\redis_string.cpp">
786789
</File>
@@ -856,6 +859,19 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
856859
RelativePath=".\src\event\event_timer.cpp">
857860
</File>
858861
</Filter>
862+
<Filter
863+
Name="disque"
864+
Filter="">
865+
<File
866+
RelativePath=".\src\disque\disque.cpp">
867+
</File>
868+
<File
869+
RelativePath=".\src\disque\disque_cond.cpp">
870+
</File>
871+
<File
872+
RelativePath=".\src\disque\disque_job.cpp">
873+
</File>
874+
</Filter>
859875
</Filter>
860876
<Filter
861877
Name="Í·Îļþ"
@@ -1281,6 +1297,9 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
12811297
<File
12821298
RelativePath=".\include\acl_cpp\redis\redis_set.hpp">
12831299
</File>
1300+
<File
1301+
RelativePath=".\include\acl_cpp\redis\redis_slot.hpp">
1302+
</File>
12841303
<File
12851304
RelativePath=".\include\acl_cpp\redis\redis_string.hpp">
12861305
</File>
@@ -1347,6 +1366,22 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
13471366
RelativePath=".\include\acl_cpp\event\event_timer.hpp">
13481367
</File>
13491368
</Filter>
1369+
<Filter
1370+
Name="disque"
1371+
Filter="">
1372+
<File
1373+
RelativePath=".\include\acl_cpp\disque\disque.hpp">
1374+
</File>
1375+
<File
1376+
RelativePath=".\include\acl_cpp\disque\disque_cond.hpp">
1377+
</File>
1378+
<File
1379+
RelativePath=".\include\acl_cpp\disque\disque_job.hpp">
1380+
</File>
1381+
<File
1382+
RelativePath=".\include\acl_cpp\disque\disque_node.hpp">
1383+
</File>
1384+
</Filter>
13501385
</Filter>
13511386
<Filter
13521387
Name="×ÊÔ´Îļþ"

‎lib_acl_cpp/lib_acl_cpp_vc2008.vcproj‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
Name="VCCLCompilerTool"
4343
Optimization="0"
4444
AdditionalIncludeDirectories=".\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;"
45-
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL"
45+
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_WIN_ICONV"
4646
MinimalRebuild="true"
4747
BasicRuntimeChecks="3"
4848
RuntimeLibrary="1"
@@ -111,7 +111,7 @@
111111
EnableIntrinsicFunctions="true"
112112
WholeProgramOptimization="false"
113113
AdditionalIncludeDirectories=".\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;"
114-
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL"
114+
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WIN_ICONV"
115115
RuntimeLibrary="0"
116116
EnableFunctionLevelLinking="true"
117117
UsePrecompiledHeader="2"
@@ -176,7 +176,7 @@
176176
Name="VCCLCompilerTool"
177177
Optimization="0"
178178
AdditionalIncludeDirectories=".\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;"
179-
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL"
179+
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV"
180180
MinimalRebuild="true"
181181
BasicRuntimeChecks="3"
182182
RuntimeLibrary="3"
@@ -255,7 +255,7 @@
255255
EnableIntrinsicFunctions="true"
256256
WholeProgramOptimization="false"
257257
AdditionalIncludeDirectories=".\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;"
258-
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WIN_ICONV;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;HAS_SQLITE;HAS_MYSQL"
258+
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_WIN_ICONV;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS"
259259
RuntimeLibrary="2"
260260
EnableFunctionLevelLinking="true"
261261
UsePrecompiledHeader="2"
@@ -1082,6 +1082,22 @@
10821082
>
10831083
</File>
10841084
</Filter>
1085+
<Filter
1086+
Name="disque"
1087+
>
1088+
<File
1089+
RelativePath=".\src\disque\disque.cpp"
1090+
>
1091+
</File>
1092+
<File
1093+
RelativePath=".\src\disque\disque_cond.cpp"
1094+
>
1095+
</File>
1096+
<File
1097+
RelativePath=".\src\disque\disque_job.cpp"
1098+
>
1099+
</File>
1100+
</Filter>
10851101
</Filter>
10861102
<Filter
10871103
Name="Í·Îļþ"
@@ -1716,6 +1732,26 @@
17161732
>
17171733
</File>
17181734
</Filter>
1735+
<Filter
1736+
Name="disque"
1737+
>
1738+
<File
1739+
RelativePath=".\include\acl_cpp\disque\disque.hpp"
1740+
>
1741+
</File>
1742+
<File
1743+
RelativePath=".\include\acl_cpp\disque\disque_cond.hpp"
1744+
>
1745+
</File>
1746+
<File
1747+
RelativePath=".\include\acl_cpp\disque\disque_job.hpp"
1748+
>
1749+
</File>
1750+
<File
1751+
RelativePath=".\include\acl_cpp\disque\disque_node.hpp"
1752+
>
1753+
</File>
1754+
</Filter>
17191755
</Filter>
17201756
<Filter
17211757
Name="×ÊÔ´Îļþ"

‎lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<ClCompile>
9090
<Optimization>Disabled</Optimization>
9191
<AdditionalIncludeDirectories>.\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
92-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_MT;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_MT;USE_WIN_ICONV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9393
<MinimalRebuild>true</MinimalRebuild>
9494
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9595
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -113,7 +113,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y</Command>
113113
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
114114
<ClCompile>
115115
<AdditionalIncludeDirectories>.\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;USE_WIN_ICONV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117117
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
118118
<PrecompiledHeader>Use</PrecompiledHeader>
119119
<PrecompiledHeaderFile>acl_stdafx.hpp</PrecompiledHeaderFile>
@@ -134,7 +134,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y</Command>
134134
<ClCompile>
135135
<Optimization>Disabled</Optimization>
136136
<AdditionalIncludeDirectories>.\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137-
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_MT;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_MT;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
138138
<MinimalRebuild>true</MinimalRebuild>
139139
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
140140
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -167,7 +167,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
167167
<ClCompile>
168168
<Optimization>Disabled</Optimization>
169169
<AdditionalIncludeDirectories>.\include;..\lib_acl\include;..\lib_protocol\include;..\include\sqlite;..\include\zlib;..\include\mysql;.\src;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
170-
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_MT;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;HAS_SQLITE;HAS_MYSQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
170+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_MT;ACL_DLL;ACL_CPP_DLL;ACL_CPP_EXPORTS;USE_WIN_ICONV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171171
<MinimalRebuild>true</MinimalRebuild>
172172
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
173173
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -220,6 +220,9 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
220220
<ClCompile Include="src\db\mysql_pool.cpp" />
221221
<ClCompile Include="src\db\query.cpp" />
222222
<ClCompile Include="src\db\sqlite_pool.cpp" />
223+
<ClCompile Include="src\disque\disque.cpp" />
224+
<ClCompile Include="src\disque\disque_cond.cpp" />
225+
<ClCompile Include="src\disque\disque_job.cpp" />
223226
<ClCompile Include="src\event\event_timer.cpp" />
224227
<ClCompile Include="src\hsocket\hsclient.cpp" />
225228
<ClCompile Include="src\hsocket\hserror.cpp" />
@@ -371,6 +374,10 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
371374
<ClInclude Include="include\acl_cpp\db\db_service_sqlite.hpp" />
372375
<ClInclude Include="include\acl_cpp\db\db_sqlite.hpp" />
373376
<ClInclude Include="include\acl_cpp\db\query.hpp" />
377+
<ClInclude Include="include\acl_cpp\disque\disque.hpp" />
378+
<ClInclude Include="include\acl_cpp\disque\disque_cond.hpp" />
379+
<ClInclude Include="include\acl_cpp\disque\disque_job.hpp" />
380+
<ClInclude Include="include\acl_cpp\disque\disque_node.hpp" />
374381
<ClInclude Include="include\acl_cpp\event\event_timer.hpp" />
375382
<ClInclude Include="include\acl_cpp\hsocket\hsclient.hpp" />
376383
<ClInclude Include="include\acl_cpp\hsocket\hserror.hpp" />

‎lib_acl_cpp/lib_acl_cpp_vc2010.vcxproj.filters‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,15 @@
457457
<ClCompile Include="src\redis\redis_slot.cpp">
458458
<Filter>src\redis</Filter>
459459
</ClCompile>
460+
<ClCompile Include="src\disque\disque.cpp">
461+
<Filter>src\disque</Filter>
462+
</ClCompile>
463+
<ClCompile Include="src\disque\disque_cond.cpp">
464+
<Filter>src\disque</Filter>
465+
</ClCompile>
466+
<ClCompile Include="src\disque\disque_job.cpp">
467+
<Filter>src\disque</Filter>
468+
</ClCompile>
460469
</ItemGroup>
461470
<ItemGroup>
462471
<ClInclude Include="src\acl_stdafx.hpp">
@@ -936,6 +945,18 @@
936945
<ClInclude Include="include\acl_cpp\redis\redis_slot.hpp">
937946
<Filter>include\redis</Filter>
938947
</ClInclude>
948+
<ClInclude Include="include\acl_cpp\disque\disque.hpp">
949+
<Filter>include\disque</Filter>
950+
</ClInclude>
951+
<ClInclude Include="include\acl_cpp\disque\disque_cond.hpp">
952+
<Filter>include\disque</Filter>
953+
</ClInclude>
954+
<ClInclude Include="include\acl_cpp\disque\disque_job.hpp">
955+
<Filter>include\disque</Filter>
956+
</ClInclude>
957+
<ClInclude Include="include\acl_cpp\disque\disque_node.hpp">
958+
<Filter>include\disque</Filter>
959+
</ClInclude>
939960
</ItemGroup>
940961
<ItemGroup>
941962
<ResourceCompile Include="lib_acl_cpp_vc2010.rc" />
@@ -1047,5 +1068,11 @@
10471068
<Filter Include="src\event">
10481069
<UniqueIdentifier>{484e9df8-18fb-4d8f-bc99-940873adca7e}</UniqueIdentifier>
10491070
</Filter>
1071+
<Filter Include="include\disque">
1072+
<UniqueIdentifier>{6eb43458-7e08-4455-8129-cce9934ac360}</UniqueIdentifier>
1073+
</Filter>
1074+
<Filter Include="src\disque">
1075+
<UniqueIdentifier>{8cd1597f-0491-4bb1-81d1-4a8e9f30edf5}</UniqueIdentifier>
1076+
</Filter>
10501077
</ItemGroup>
10511078
</Project>

0 commit comments

Comments
 (0)