Skip to content
This repository has been archived by the owner on Sep 19, 2018. It is now read-only.

Commit

Permalink
Update Linux/Windows BLPAPI to v3.8.8.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
@apaprocki
apaprocki committed May 29, 2015
1 parent 334a2b1 commit a4ed0f4
Show file tree
Hide file tree
Showing 42 changed files with 1,405 additions and 654 deletions.
22 changes: 18 additions & 4 deletions binding.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'conditions': [
['OS=="win"', {
'include_dirs': [
'<(module_root_dir)/deps/blpapi/include-3.7.9.1'
'<(module_root_dir)/deps/blpapi/include-3.8.8.1'
],
'msvs_settings': {
'VCCLCompilerTool': {
Expand All @@ -19,18 +19,32 @@
['target_arch=="ia32"', {
'libraries': [
'<(module_root_dir)/deps/blpapi/win/blpapi3_32.lib'
]
],
'copies: [{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(module_root_dir)/deps/blpapi/win/blpapi3_32.dll'
]
}]
}],
['target_arch=="x64"', {
'msvs_configuration_platform': 'x64',
'msbuild_toolset': 'v120_xp',
'libraries': [
'<(module_root_dir)/deps/blpapi/win/blpapi3_64.lib'
]
],
'copies: [{
'destination': '<(PRODUCT_DIR)',
'files': [
'<(module_root_dir)/deps/blpapi/win/blpapi3_64.dll'
]
}]
}]
]
}],
['OS=="linux"', {
'include_dirs': [
'<(module_root_dir)/deps/blpapi/include-3.7.9.1'
'<(module_root_dir)/deps/blpapi/include-3.8.8.1'
],
'ldflags': [
'-Wl,-R<(module_root_dir)/deps/blpapi/linux',
Expand Down
190 changes: 0 additions & 190 deletions deps/blpapi/include-3.7.9.1/blpapi_versioninfo.h
View file

This file was deleted.

0 .../include-3.7.9.1/blpapi_abstractsession.h → .../include-3.8.8.1/blpapi_abstractsession.h
View file
File renamed without changes.
72 changes: 59 additions & 13 deletions deps/blpapi/include-3.7.9.1/blpapi_call.h → deps/blpapi/include-3.8.8.1/blpapi_call.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
? (g_blpapiFunctionEntries.FUNCNAME) \
: BLPAPI_UNSUPPORTED_CALL(FUNCNAME))

#define BLPAPI_CALL_AVAILABLE(FUNCNAME) BLPAPI_TABLE_CHECK(FUNCNAME)
#define BLPAPI_CALL(FUNCNAME) BLPAPI_TABLE_CALL(FUNCNAME)

#define BLPAPI_UNSUPPORTED_CALL(FUNCNAME) \
(throw UnsupportedOperationException(#FUNCNAME " not supported"), 0)

Expand All @@ -58,23 +61,20 @@
blpapi_EventFormatter_appendRecapMessageSeq)(a1, a2, a3, a4, a5))

#define BLPAPI_CALL_MESSAGE_ADDREF(a1) \
do { \
if (BLPAPI_TABLE_CHECK(blpapi_Message_addRef)) \
g_blpapiFunctionEntries.blpapi_Message_addRef(a1); \
} while(0)
(BLPAPI_TABLE_CHECK(blpapi_Message_addRef) \
? g_blpapiFunctionEntries.blpapi_Message_addRef(a1) \
: 0)

#define BLPAPI_CALL_MESSAGE_RELEASE(a1) \
do { \
if (BLPAPI_TABLE_CHECK(blpapi_Message_release)) \
g_blpapiFunctionEntries.blpapi_Message_release(a1); \
} while(0)
(BLPAPI_TABLE_CHECK(blpapi_Message_release) \
? g_blpapiFunctionEntries.blpapi_Message_release(a1) \
: 0)

#define BLPAPI_CALL_SESSIONOPTIONS_SETMAXEVENTQUEUESIZE(a1, a2) \
do { \
if (BLPAPI_TABLE_CHECK(blpapi_SessionOptions_setMaxEventQueueSize)) \
g_blpapiFunctionEntries. \
blpapi_SessionOptions_setMaxEventQueueSize(a1, a2); \
} while(0)
(BLPAPI_TABLE_CHECK(blpapi_SessionOptions_setMaxEventQueueSize) \
? g_blpapiFunctionEntries. \
blpapi_SessionOptions_setMaxEventQueueSize(a1, a2) \
: 0)

#define BLPAPI_CALL_SESSIONOPTIONS_SETSLOWCONSUMERHIWATERMARK(a1, a2) \
(BLPAPI_TABLE_CHECK( \
Expand Down Expand Up @@ -268,7 +268,38 @@
blpapi_ServiceRegistrationOptions_removeAllActiveSubServiceCodeRanges)(\
a1))

#define BLPAPI_CALL_MESSAGE_TIMERECEIVED(a1, a2) \
(BLPAPI_TABLE_CALL(blpapi_Message_timeReceived)(a1, a2))

#define BLPAPI_CALL_SESSIONOPTION_SETRECORDSUBSCRIPTIONDATARECEIVETIMES(a1, \
a2) \
(BLPAPI_TABLE_CHECK( \
blpapi_SessionOptions_setRecordSubscriptionDataReceiveTimes) \
? g_blpapiFunctionEntries \
.blpapi_SessionOptions_setRecordSubscriptionDataReceiveTimes(a1, a2) \
: 0)

#define BLPAPI_CALL_SESSIONOPTION_RECORDSUBSCRIPTIONDATARECEIVETIMES(a1) \
(BLPAPI_TABLE_CHECK( \
blpapi_SessionOptions_recordSubscriptionDataReceiveTimes) \
? g_blpapiFunctionEntries \
.blpapi_SessionOptions_recordSubscriptionDataReceiveTimes(a1) \
: false)

#define BLPAPI_CALL_TIMEPOINTUTIL_NANOSECONDSBETWEEN(a1, a2) \
(BLPAPI_TABLE_CALL(blpapi_TimePointUtil_nanosecondsBetween)(a1, a2))

#define BLPAPI_CALL_HIGHRESOLUTIONCLOCK_NOW(a1) \
(BLPAPI_TABLE_CALL(blpapi_HighResolutionClock_now)(a1))

#define BLPAPI_CALL_HIGHPRECISIONDATETIME_FROMTIMEPOINT(a1, a2, a3) \
(BLPAPI_TABLE_CALL(blpapi_HighPrecisionDatetime_fromTimePoint)(a1, a2, a3))

#else // if defined(_WIN32) || defined(__WIN32__)

#define BLPAPI_CALL_AVAILABLE(FUNCNAME) true
#define BLPAPI_CALL(FUNCNAME) FUNCNAME

#define BLPAPI_CALL_EVENTFORMATTER_APPENDMESSAGESEQ(a1, a2, a3, a4, a5, a6) \
(blpapi_EventFormatter_appendMessageSeq)(a1, a2, a3, a4, a5, a6)
#define BLPAPI_CALL_EVENTFORMATTER_APPENDRECAPMESSAGESEQ(a1, a2, a3, a4, a5) \
Expand Down Expand Up @@ -364,6 +395,21 @@
a1) \
(blpapi_ServiceRegistrationOptions_removeAllActiveSubServiceCodeRanges)(a1)

#define BLPAPI_CALL_MESSAGE_TIMERECEIVED(a1, a2) \
(blpapi_Message_timeReceived)(a1, a2)
#define BLPAPI_CALL_SESSIONOPTION_SETRECORDSUBSCRIPTIONDATARECEIVETIMES(a1, \
a2) \
(blpapi_SessionOptions_setRecordSubscriptionDataReceiveTimes)(a1, a2)
#define BLPAPI_CALL_SESSIONOPTION_RECORDSUBSCRIPTIONDATARECEIVETIMES(a1) \
(blpapi_SessionOptions_recordSubscriptionDataReceiveTimes)(a1)

#define BLPAPI_CALL_TIMEPOINTUTIL_NANOSECONDSBETWEEN(a1,a2) \
(blpapi_TimePointUtil_nanosecondsBetween)(a1, a2)
#define BLPAPI_CALL_HIGHRESOLUTIONCLOCK_NOW(a1) \
(blpapi_HighResolutionClock_now)(a1)
#define BLPAPI_CALL_HIGHPRECISIONDATETIME_FROMTIMEPOINT(a1, a2, a3) \
(blpapi_HighPrecisionDatetime_fromTimePoint)(a1, a2, a3)

#endif // if defined(_WIN32) || defined(__WIN32__)

#endif // __cplusplus
Expand Down
12 changes: 6 additions & 6 deletions .../blpapi/include-3.7.9.1/blpapi_constant.h → .../blpapi/include-3.8.8.1/blpapi_constant.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,9 @@ std::string Constant::getValueAsString() const
}

inline
void Constant::setUserData(void *userData)
void Constant::setUserData(void *newUserData)
{
blpapi_Constant_setUserData(d_impl_p, userData);
blpapi_Constant_setUserData(d_impl_p, newUserData);
}

inline
Expand Down Expand Up @@ -612,9 +612,9 @@ int ConstantList::numConstants() const
}

inline
Constant ConstantList::getConstant(const Name& name) const
Constant ConstantList::getConstant(const Name& constantName) const
{
return blpapi_ConstantList_getConstant(d_impl_p, 0, name.impl());
return blpapi_ConstantList_getConstant(d_impl_p, 0, constantName.impl());
}

inline
Expand All @@ -636,9 +636,9 @@ const blpapi_ConstantList_t *ConstantList::impl() const
}

inline
void ConstantList::setUserData(void *userData)
void ConstantList::setUserData(void *newUserData)
{
blpapi_ConstantList_setUserData(d_impl_p, userData);
blpapi_ConstantList_setUserData(d_impl_p, newUserData);
}

inline
Expand Down
Loading

0 comments on commit a4ed0f4

Please sign in to comment.