Skip to content

Commit 17b10e0

Browse files
Version 10.0.05-pre
1 parent 0616bbe commit 17b10e0

File tree

199 files changed

+4785
-4130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+4785
-4130
lines changed

Src/Build/versel.dll

16 KB
Binary file not shown.

Src/BuildVC2015/OSF.sln

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TH", "TH.vcxproj", "{5D8222
5353
EndProject
5454
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "learn-torch-nn", "learn-torch-nn.vcxproj", "{A07E6D33-C2E1-4FC0-B2FA-7E847FC918F9}"
5555
EndProject
56+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BDB6232", "BDB6232.vcxproj", "{5F351708-3B48-4400-9E7E-E8EE424FDFF8}"
57+
EndProject
5658
Global
5759
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5860
Debug Multithreaded|x64 = Debug Multithreaded|x64
@@ -1255,6 +1257,58 @@ Global
12551257
{A07E6D33-C2E1-4FC0-B2FA-7E847FC918F9}.Universe-HTT|x64.Build.0 = Release|x64
12561258
{A07E6D33-C2E1-4FC0-B2FA-7E847FC918F9}.Universe-HTT|x86.ActiveCfg = Release|Win32
12571259
{A07E6D33-C2E1-4FC0-B2FA-7E847FC918F9}.Universe-HTT|x86.Build.0 = Release|Win32
1260+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
1261+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Multithreaded|x64.Build.0 = Debug|x64
1262+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Multithreaded|x86.ActiveCfg = Debug|Win32
1263+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Multithreaded|x86.Build.0 = Debug|Win32
1264+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
1265+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Singlethreaded|x64.Build.0 = Debug|x64
1266+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Singlethreaded|x86.ActiveCfg = Debug|Win32
1267+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug Singlethreaded|x86.Build.0 = Debug|Win32
1268+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug|x64.ActiveCfg = Debug|x64
1269+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug|x64.Build.0 = Debug|x64
1270+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug|x86.ActiveCfg = Debug|Win32
1271+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Debug|x86.Build.0 = Debug|Win32
1272+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.DebugU|x64.ActiveCfg = Debug|x64
1273+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.DebugU|x64.Build.0 = Debug|x64
1274+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.DebugU|x86.ActiveCfg = Debug|Win32
1275+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.DebugU|x86.Build.0 = Debug|Win32
1276+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllDebug|x64.ActiveCfg = MtDllDebug|x64
1277+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllDebug|x64.Build.0 = MtDllDebug|x64
1278+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllDebug|x86.ActiveCfg = MtDllDebug|Win32
1279+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllDebug|x86.Build.0 = MtDllDebug|Win32
1280+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllRelease|x64.ActiveCfg = MtDllRelease|x64
1281+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllRelease|x64.Build.0 = MtDllRelease|x64
1282+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllRelease|x86.ActiveCfg = MtDllRelease|Win32
1283+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.MtDllRelease|x86.Build.0 = MtDllRelease|Win32
1284+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Multithreaded|x64.ActiveCfg = Release|x64
1285+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Multithreaded|x64.Build.0 = Release|x64
1286+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Multithreaded|x86.ActiveCfg = Release|Win32
1287+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Multithreaded|x86.Build.0 = Release|Win32
1288+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Singlethreaded|x64.ActiveCfg = Release|x64
1289+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Singlethreaded|x64.Build.0 = Release|x64
1290+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Singlethreaded|x86.ActiveCfg = Release|Win32
1291+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release Singlethreaded|x86.Build.0 = Release|Win32
1292+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release|x64.ActiveCfg = Release|x64
1293+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release|x64.Build.0 = Release|x64
1294+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release|x86.ActiveCfg = Release|Win32
1295+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Release|x86.Build.0 = Release|Win32
1296+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ReleaseU|x64.ActiveCfg = Release|x64
1297+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ReleaseU|x64.Build.0 = Release|x64
1298+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ReleaseU|x86.ActiveCfg = Release|Win32
1299+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ReleaseU|x86.Build.0 = Release|Win32
1300+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerDebug|x64.ActiveCfg = ServerDebug|x64
1301+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerDebug|x64.Build.0 = ServerDebug|x64
1302+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerDebug|x86.ActiveCfg = ServerDebug|Win32
1303+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerDebug|x86.Build.0 = ServerDebug|Win32
1304+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerRelease|x64.ActiveCfg = ServerRelease|x64
1305+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerRelease|x64.Build.0 = ServerRelease|x64
1306+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerRelease|x86.ActiveCfg = ServerRelease|Win32
1307+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.ServerRelease|x86.Build.0 = ServerRelease|Win32
1308+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Universe-HTT|x64.ActiveCfg = Universe-HTT|x64
1309+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Universe-HTT|x64.Build.0 = Universe-HTT|x64
1310+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Universe-HTT|x86.ActiveCfg = Universe-HTT|Win32
1311+
{5F351708-3B48-4400-9E7E-E8EE424FDFF8}.Universe-HTT|x86.Build.0 = Universe-HTT|Win32
12581312
EndGlobalSection
12591313
GlobalSection(SolutionProperties) = preSolution
12601314
HideSolutionNode = FALSE

Src/BuildVC2015/papyrus.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,6 @@
19981998
<ItemGroup>
19991999
<ProjectReference Include="BDB.vcxproj">
20002000
<Project>{151f44bb-2aaa-4e54-91a6-79ba38f41639}</Project>
2001-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
20022001
</ProjectReference>
20032002
<ProjectReference Include="cairo-1.14.2.vcxproj">
20042003
<Project>{1022ff32-79e9-44df-b5e3-9130f0c4252d}</Project>

Src/BuildVC2015/slib.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@
907907
</ClCompile>
908908
<ClCompile Include="..\SLib\cregexp.cpp" />
909909
<ClCompile Include="..\SLib\crypto.cpp" />
910+
<ClCompile Include="..\SLib\curl-inet_ntop.cpp" />
910911
<ClCompile Include="..\SLib\curl-parsedate.cpp" />
911912
<ClCompile Include="..\SLib\dec.cpp" />
912913
<ClCompile Include="..\SLib\Dlgprocs.cpp" />

Src/BuildVC2015/slib.vcxproj.filters

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<ClCompile Include="..\SLib\test-cairo.cpp" />
124124
<ClCompile Include="..\SLib\test-openssl.cpp" />
125125
<ClCompile Include="..\SLib\saudio.cpp" />
126+
<ClCompile Include="..\SLib\curl-inet_ntop.cpp" />
126127
</ItemGroup>
127128
<ItemGroup>
128129
<ClInclude Include="..\Include\fann.h">

Src/BuildVC70/slib.vcproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,9 @@
507507
<File
508508
RelativePath="..\SLib\crypto.cpp">
509509
</File>
510+
<File
511+
RelativePath="..\SLib\curl-inet_ntop.cpp">
512+
</File>
510513
<File
511514
RelativePath="..\SLib\curl-parsedate.cpp">
512515
</File>

Src/Db/DBDICT.CPP

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,7 @@ int SLAPI TablePartsEnum::Init(const char * pPath)
542542
MainPart = pPath;
543543
//
544544
long i = 0;
545-
List.Clear();
546-
List.setPointer(0);
545+
List.Z().setPointer(0);
547546
List.Add(++i, MainPart);
548547
SDirEntry fb;
549548
while(direc.Next(&fb) > 0)

Src/Db/dbprvdr.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ int DbLoginBlockArray::MakeList(StrAssocArray * pList, long options) const
308308
//
309309
SLAPI DbProvider::DbProvider(DbDictionary * pDict, long capability) : P_Dict(pDict), Capability(capability), State(0), DbPathID(0)
310310
{
311-
DbUUID.SetZero();
312311
}
313312

314313
SLAPI DbProvider::~DbProvider()

Src/Db/dbsql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1136,7 +1136,7 @@ SOraDbProvider::SOraDbProvider(const char * pDataPath) :
11361136
Err = OhAlloc(OCI_HTYPE_ERROR);
11371137
Svr = OhAlloc(OCI_HTYPE_SERVER);
11381138
{
1139-
CrsfcNameList.Clear();
1139+
CrsfcNameList.Z();
11401140
CrsfcNameList.Add(/*csrfpa*/ 2, "OSQL");
11411141
CrsfcNameList.Add(/*csrfex*/ 4, "OEXEC");
11421142
CrsfcNameList.Add(/*csrfbi*/ 6, "OBIND");

Src/Doc/VERSION.TXT

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15235,4 +15235,10 @@ Ver 1.2 Date 13/09/96
1523515235
���������� � ���������� backup ������ ������ � ������ (������ ������ ��������� � ��������� ��-�� ������
1523615236
������� �����).
1523715237
- {DEV} ��������� � ������ json.
15238+
08/05/2018 v10.0.05
15239+
!- {�������� ���������} ������ (�������-��!) �������� ���������� �������� �� �����, � �������� � ������������
15240+
��� ������� � ������������ � �������������� ������� ��������� �������.
15241+
- {�������� ������} � �������� ���������� � �������� ����� � � �������� ������ ���� � ����������� �������� �� STATIC
15242+
�� EDIT (read-only) � ����� ���� ����������� ���������� ��� ���������� � ����� ������.
15243+
-FIX: {����������} ������ ��� �������������� ����������� ����� ��������� ���������������� ������ "������������ ����������� �����".
1523815244

0 commit comments

Comments
 (0)