Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DXFC-329 #90

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
a2ed710
DXFC-329
ttldtor May 23, 2022
b21f933
DXFC-329
ttldtor May 23, 2022
c8f6643
Merge remote-tracking branch 'origin/feature/DXFC-329-2' into feature…
ttldtor May 23, 2022
40c34d8
DXFC-329
ttldtor May 23, 2022
dcfe44c
DXFC-329
ttldtor May 23, 2022
c8b1306
DXFC-329
ttldtor May 23, 2022
293d236
DXFC-329
ttldtor May 23, 2022
9f2187e
DXFC-329
ttldtor May 23, 2022
0c9233c
DXFC-329
ttldtor May 23, 2022
44c5084
DXFC-329
ttldtor May 24, 2022
f6f13c8
DXFC-329
ttldtor May 24, 2022
78f7c01
DXFC-329
ttldtor May 24, 2022
6d38510
DXFC-329
ttldtor May 26, 2022
592ce41
DXFC-329
ttldtor May 26, 2022
e1ca7f7
DXFC-329
ttldtor May 26, 2022
c03fc71
DXFC-329
ttldtor May 27, 2022
ed4bb6d
DXFC-329
ttldtor May 27, 2022
eae6e2f
DXFC-329
ttldtor May 27, 2022
42ba66d
DXFC-329
ttldtor May 28, 2022
3df2547
DXFC-329
ttldtor May 28, 2022
3471748
DXFC-329
ttldtor May 29, 2022
2a50fbd
DXFC-329
ttldtor May 29, 2022
e2276b8
DXFC-329
ttldtor May 29, 2022
de49cc3
DXFC-329
ttldtor May 30, 2022
c8f011f
DXFC-329
ttldtor May 31, 2022
7e892cb
DXFC-329
ttldtor Jun 1, 2022
66baa62
DXFC-329
ttldtor Jun 2, 2022
2e55396
DXFC-329
ttldtor Jun 2, 2022
896a7ec
DXFC-329
ttldtor Jun 2, 2022
91f4468
DXFC-329
ttldtor Jun 2, 2022
2091c27
DXFC-329
ttldtor Jun 2, 2022
76de7b4
DXFC-329
ttldtor Jun 2, 2022
4738758
DXFC-329
ttldtor Jun 2, 2022
7c09bf3
DXFC-329
ttldtor Jun 4, 2022
acd927c
DXFC-329
ttldtor Jun 5, 2022
211b0da
DXFC-329
ttldtor Jun 5, 2022
20d0948
DXFC-329
ttldtor Jun 5, 2022
01c179a
DXFC-329
ttldtor Jun 5, 2022
e9cba17
DXFC-329
ttldtor Jun 5, 2022
dcfdf43
DXFC-329
ttldtor Jun 5, 2022
29a0829
DXFC-329
ttldtor Jun 6, 2022
cf1ce5c
DXFC-329
ttldtor Jun 6, 2022
aaa5457
DXFC-329
ttldtor Jun 9, 2022
b7cfc38
DXFC-329
ttldtor Jun 20, 2022
d04de85
DXFC-329
ttldtor Jun 27, 2022
e79b3eb
DXFC-329
ttldtor Jun 27, 2022
5731eaa
DXFC-329
ttldtor Jun 27, 2022
7f387e1
DXFC-376
ttldtor Jul 1, 2022
717009f
[DXFC-376] Add an example with the ability to specify from-time and …
stdcion Jul 1, 2022
2d93fa3
DXFC-329
ttldtor Jun 4, 2022
57b3271
Merge branch 'master' into feature/DXFC-329-2
ttldtor Jul 1, 2022
f795528
Revert "DXFC-329"
ttldtor Jul 1, 2022
c58b904
DXFC-329
ttldtor Jul 1, 2022
6c798f4
DXFC-329
ttldtor Jul 1, 2022
8e14659
DXFC-329
ttldtor Jul 1, 2022
1e3718f
Update Snapshot.hpp
ttldtor Jul 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -57,4 +57,4 @@ jobs:
make all

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/github-ci-pull-req.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cd build-test
cmake -DCMAKE_BUILD_TYPE=Release -DDISABLE_TLS=ON -DTARGET_PLATFORM=x64 -DDXFC_BUILD_UNIT_TESTS=ON ..
cmake --build . --config Release
ctest -C Release
ctest -VV -C Release
env:
CTEST_OUTPUT_ON_FAILURE: True

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ cmake-build-release*/**
/**/*.*~
/docs/dxfeed*/
**/*.swp
CMakeSettings.json
linux-build/**

16 changes: 8 additions & 8 deletions DXFeed.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoTLS|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand Down Expand Up @@ -174,7 +174,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;DXFEED_CODEC_TLS_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand Down Expand Up @@ -208,7 +208,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugNoTLS|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand Down Expand Up @@ -238,7 +238,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;DXFEED_CODEC_TLS_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand Down Expand Up @@ -271,7 +271,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoTLS|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand All @@ -296,7 +296,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;DXFEED_CODEC_TLS_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand Down Expand Up @@ -324,7 +324,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoTLS|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand All @@ -348,7 +348,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_75;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)thirdparty\toml11;$(SolutionDir)thirdparty\boost-1_79;$(SolutionDir)src;$(SolutionDir)lib\libressl\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DXFEED_EXPORTS;DXFEED_CODEC_TLS_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
Expand Down
15 changes: 9 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ Find useful information in self-service dxFeed Knowledge Base, or C API framewor
## Dependencies

- API
- Boost.Locale.EncodingUtf (1.75)
- Boost.Locale.EncodingUtf (1.79)
- Boost.MultiIndex (1.79)
- [TOML11](https://github.com/ToruNiina/toml11) (3.6.0)
- [optional-lite](https://github.com/martinmoene/optional-lite) (3.5.0)
- [variant-lite](https://github.com/martinmoene/variant-lite) (2.0.0)
- Tests
- [Catch2](https://github.com/catchorg/Catch2) (2.13.8)
- C++ Wrappers
- [Args](https://github.com/Taywee/args) (6.2.2)
- [fmt](https://github.com/fmtlib/fmt) (8.0.0)
- [optional-lite](https://github.com/martinmoene/optional-lite) (3.1.1)
- [string-view-lite](https://github.com/martinmoene/string-view-lite) (1.1.0)
- [variant-lite](https://github.com/martinmoene/variant-lite) (1.1.0)
- [Args](https://github.com/Taywee/args) (6.3.0)
- [fmt](https://github.com/fmtlib/fmt) (8.1.1)
- [optional-lite](https://github.com/martinmoene/optional-lite) (3.5.0)
- [string-view-lite](https://github.com/martinmoene/string-view-lite) (1.6.0)
- [variant-lite](https://github.com/martinmoene/variant-lite) (2.0.0)



Expand Down
6 changes: 0 additions & 6 deletions include/DXErrorCodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@
* @brief dxFeed C API errors declarations
*/

/* -------------------------------------------------------------------------- */
/*
* Error codes
*/
/* -------------------------------------------------------------------------- */

/// Error level
typedef enum dx_log_level_t {
Expand Down Expand Up @@ -217,7 +215,6 @@ typedef enum {
dx_ec_count
} dx_error_code_t;

/* -------------------------------------------------------------------------- */
/**
* @ingroup c-api-common
*
Expand All @@ -228,10 +225,8 @@ typedef enum {
* @returns Error description string
*
*/
/* -------------------------------------------------------------------------- */
dxf_const_string_t dx_get_error_description(dx_error_code_t code);

/* -------------------------------------------------------------------------- */
/**
* @ingroup c-api-common
*
Expand All @@ -242,7 +237,6 @@ dxf_const_string_t dx_get_error_description(dx_error_code_t code);
* @returns Error level
*
*/
/* -------------------------------------------------------------------------- */
dx_log_level_t dx_get_log_level(dx_error_code_t code);

#endif /* DX_ERROR_CODES_H_INCLUDED */
6 changes: 0 additions & 6 deletions include/DXFeed.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,9 @@
#include "DXTypes.h"
#include "EventData.h"

/* -------------------------------------------------------------------------- */
/*
* DXFeed API function return value codes
*/
/* -------------------------------------------------------------------------- */

/**
* @ingroup functions-macros
Expand All @@ -117,11 +115,9 @@
*/
#define DXF_FAILURE 0

/* -------------------------------------------------------------------------- */
/*
* DXFeed API generic types
*/
/* -------------------------------------------------------------------------- */

/**
* @ingroup callback-types
Expand Down Expand Up @@ -193,15 +189,13 @@ typedef int (*dxf_socket_thread_creation_notifier_t)(dxf_connection_t connection
*/
typedef void (*dxf_socket_thread_destruction_notifier_t)(dxf_connection_t connection, void* user_data);

/* -------------------------------------------------------------------------- */
/*
* DXFeed C API functions

* All functions return DXF_SUCCESS on success and DXF_FAILURE if some error
* has occurred. Use 'dxf_get_last_error' to retrieve the error code
* and description.
*/
/* -------------------------------------------------------------------------- */

/**
* @ingroup c-api-connection-functions
Expand Down
1 change: 1 addition & 0 deletions include/DXTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ typedef void* dxf_candle_attributes_t;

/// Snapshot
typedef void* dxf_snapshot_t;
typedef long long dxf_snapshot_v2_t;

/// Price level book
typedef void* dxf_price_level_book_t;
Expand Down
Loading