Skip to content

Commit 38131d4

Browse files
aleks-faleks-f
committed
Var/JSON changes
- JSON support for Dynamic Struct and Array - added VarIterator - modified behavior of empty Var
1 parent 1f8fcaa commit 38131d4

42 files changed

Lines changed: 1857 additions & 287 deletions

Some content is hidden

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

‎Data/include/Poco/Data/Statement.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class Data_API Statement
8181
/// However, calling executAsync() on a synchronous statement shall execute
8282
/// asynchronously but without altering the underlying statement's synchronous nature.
8383
///
84-
/// Once asyncronous, a statement can be reverted back to synchronous state in two ways:
84+
/// Once asynchronous, a statement can be reverted back to synchronous state in two ways:
8585
///
8686
/// 1) By calling setAsync(false)
8787
/// 2) By means of 'sync' or 'reset' manipulators

‎Foundation/Foundation_CE_vs90.vcproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6813,6 +6813,10 @@
68136813
RelativePath=".\include\Poco\Dynamic\VarHolder.h"
68146814
>
68156815
</File>
6816+
<File
6817+
RelativePath=".\include\Poco\Dynamic\VarIterator.h"
6818+
>
6819+
</File>
68166820
</Filter>
68176821
<Filter
68186822
Name="Source Files"
@@ -6825,6 +6829,10 @@
68256829
RelativePath=".\src\VarHolder.cpp"
68266830
>
68276831
</File>
6832+
<File
6833+
RelativePath=".\src\VarIterator.cpp"
6834+
>
6835+
</File>
68286836
</Filter>
68296837
</Filter>
68306838
</Files>

‎Foundation/Foundation_vs100.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@
389389
<ClCompile Include="src\UTF32Encoding.cpp" />
390390
<ClCompile Include="src\Var.cpp" />
391391
<ClCompile Include="src\VarHolder.cpp" />
392+
<ClCompile Include="src\VarIterator.cpp" />
392393
<ClCompile Include="src\Void.cpp" />
393394
<ClCompile Include="src\Base64Decoder.cpp" />
394395
<ClCompile Include="src\Base64Encoder.cpp" />
@@ -998,6 +999,7 @@
998999
<ClInclude Include="include\Poco\Dynamic\Struct.h" />
9991000
<ClInclude Include="include\Poco\Dynamic\Var.h" />
10001001
<ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
1002+
<ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
10011003
<ClInclude Include="include\Poco\Environment.h" />
10021004
<ClInclude Include="include\Poco\Environment_UNIX.h" />
10031005
<ClInclude Include="include\Poco\Environment_VMS.h" />

‎Foundation/Foundation_vs100.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,9 @@
870870
<ClCompile Include="src\VarHolder.cpp">
871871
<Filter>Dynamic\Source Files</Filter>
872872
</ClCompile>
873+
<ClCompile Include="src\VarIterator.cpp">
874+
<Filter>Dynamic\Source Files</Filter>
875+
</ClCompile>
873876
<ClCompile Include="src\Latin2Encoding.cpp">
874877
<Filter>Text\Source Files</Filter>
875878
</ClCompile>
@@ -1820,6 +1823,9 @@
18201823
<ClInclude Include="include\Poco\Dynamic\VarHolder.h">
18211824
<Filter>Dynamic\Header Files</Filter>
18221825
</ClInclude>
1826+
<ClInclude Include="include\Poco\Dynamic\VarIterator.h">
1827+
<Filter>Dynamic\Header Files</Filter>
1828+
</ClInclude>
18231829
<ClInclude Include="include\Poco\Windows1250Encoding.h">
18241830
<Filter>Text\Header Files</Filter>
18251831
</ClInclude>

‎Foundation/Foundation_vs110.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@
393393
<ClCompile Include="src\UTF32Encoding.cpp" />
394394
<ClCompile Include="src\Var.cpp" />
395395
<ClCompile Include="src\VarHolder.cpp" />
396+
<ClCompile Include="src\VarIterator.cpp" />
396397
<ClCompile Include="src\Void.cpp" />
397398
<ClCompile Include="src\Base32Decoder.cpp" />
398399
<ClCompile Include="src\Base32Encoder.cpp" />
@@ -1002,6 +1003,7 @@
10021003
<ClInclude Include="include\Poco\Dynamic\Struct.h" />
10031004
<ClInclude Include="include\Poco\Dynamic\Var.h" />
10041005
<ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
1006+
<ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
10051007
<ClInclude Include="include\Poco\Environment.h" />
10061008
<ClInclude Include="include\Poco\Environment_UNIX.h" />
10071009
<ClInclude Include="include\Poco\Environment_VMS.h" />

‎Foundation/Foundation_vs110.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,9 @@
888888
<ClCompile Include="src\VarHolder.cpp">
889889
<Filter>Dynamic\Source Files</Filter>
890890
</ClCompile>
891+
<ClCompile Include="src\Variterator.cpp">
892+
<Filter>Dynamic\Source Files</Filter>
893+
</ClCompile>
891894
<ClCompile Include="src\Latin2Encoding.cpp">
892895
<Filter>Text\Source Files</Filter>
893896
</ClCompile>
@@ -1850,6 +1853,9 @@
18501853
<ClInclude Include="include\Poco\Dynamic\VarHolder.h">
18511854
<Filter>Dynamic\Header Files</Filter>
18521855
</ClInclude>
1856+
<ClInclude Include="include\Poco\Dynamic\VarIterator.h">
1857+
<Filter>Dynamic\Header Files</Filter>
1858+
</ClInclude>
18531859
<ClInclude Include="include\Poco\Windows1250Encoding.h">
18541860
<Filter>Text\Header Files</Filter>
18551861
</ClInclude>

‎Foundation/Foundation_vs71.vcproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4700,6 +4700,9 @@
47004700
<File
47014701
RelativePath=".\src\VarHolder.cpp">
47024702
</File>
4703+
<File
4704+
RelativePath=".\src\VarIterator.cpp">
4705+
</File>
47034706
</Filter>
47044707
<Filter
47054708
Name="Header Files"
@@ -4716,6 +4719,9 @@
47164719
<File
47174720
RelativePath=".\include\poco\dynamic\VarHolder.h">
47184721
</File>
4722+
<File
4723+
RelativePath=".\include\poco\dynamic\VarIterator.h">
4724+
</File>
47194725
</Filter>
47204726
</Filter>
47214727
<File

‎Foundation/Foundation_vs80.vcproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6101,6 +6101,10 @@
61016101
RelativePath=".\include\Poco\Dynamic\VarHolder.h"
61026102
>
61036103
</File>
6104+
<File
6105+
RelativePath=".\include\Poco\Dynamic\VarIterator.h"
6106+
>
6107+
</File>
61046108
</Filter>
61056109
<Filter
61066110
Name="Source Files"
@@ -6113,6 +6117,10 @@
61136117
RelativePath=".\src\VarHolder.cpp"
61146118
>
61156119
</File>
6120+
<File
6121+
RelativePath=".\src\VarIterator.cpp"
6122+
>
6123+
</File>
61166124
</Filter>
61176125
</Filter>
61186126
<File

‎Foundation/Foundation_vs90.vcproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6094,6 +6094,10 @@
60946094
RelativePath=".\include\Poco\Dynamic\VarHolder.h"
60956095
>
60966096
</File>
6097+
<File
6098+
RelativePath=".\include\Poco\Dynamic\VarIterator.h"
6099+
>
6100+
</File>
60976101
</Filter>
60986102
<Filter
60996103
Name="Source Files"
@@ -6106,6 +6110,10 @@
61066110
RelativePath=".\src\VarHolder.cpp"
61076111
>
61086112
</File>
6113+
<File
6114+
RelativePath=".\src\VarIterator.cpp"
6115+
>
6116+
</File>
61096117
</Filter>
61106118
</Filter>
61116119
<File

‎Foundation/Foundation_x64_vs100.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@
393393
<ClCompile Include="src\UTF32Encoding.cpp" />
394394
<ClCompile Include="src\Var.cpp" />
395395
<ClCompile Include="src\VarHolder.cpp" />
396+
<ClCompile Include="src\VarIterator.cpp" />
396397
<ClCompile Include="src\Void.cpp" />
397398
<ClCompile Include="src\Base32Decoder.cpp" />
398399
<ClCompile Include="src\Base32Encoder.cpp" />
@@ -1001,6 +1002,7 @@
10011002
<ClInclude Include="include\Poco\Dynamic\Struct.h" />
10021003
<ClInclude Include="include\Poco\Dynamic\Var.h" />
10031004
<ClInclude Include="include\Poco\Dynamic\VarHolder.h" />
1005+
<ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
10041006
<ClInclude Include="include\Poco\Environment.h" />
10051007
<ClInclude Include="include\Poco\Environment_UNIX.h" />
10061008
<ClInclude Include="include\Poco\Environment_VMS.h" />

0 commit comments

Comments
 (0)