Skip to content

Commit c95f4a0

Browse files
Update Numbers-bindings in examples
1 parent d371c0c commit c95f4a0

File tree

4 files changed

+718
-49
lines changed

4 files changed

+718
-49
lines changed

Examples/CrossComponentInheritance/Numbers_component/Bindings/CppDynamic/numbers_abi.hpp

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (C) 2019 Numbers developers
44
55
All rights reserved.
66
7-
This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
7+
This file has been generated by the Automatic Component Toolkit (ACT) version 2.0.0-develop.
88
99
Abstract: This is an autogenerated C++-Header file in order to allow an easy
1010
use of Numbers library
@@ -34,7 +34,6 @@ extern "C" {
3434
/*************************************************************************************************************************
3535
Class definition for Base
3636
**************************************************************************************************************************/
37-
3837
/**
3938
* Returns the address of the SymbolLookupMethod
4039
*
@@ -43,23 +42,20 @@ extern "C" {
4342
* @return error code or 0 (success)
4443
*/
4544
NUMBERS_DECLSPEC NumbersResult numbers_base_getsymbollookupmethod(Numbers_Base pBase, Numbers_pvoid * pSymbolLookupMethod);
46-
4745
/**
4846
* Releases shared ownership of an Instance
4947
*
5048
* @param[in] pBase - Base instance.
5149
* @return error code or 0 (success)
5250
*/
5351
NUMBERS_DECLSPEC NumbersResult numbers_base_releaseinstance(Numbers_Base pBase);
54-
5552
/**
5653
* Acquires shared ownership of an Instance
5754
*
5855
* @param[in] pBase - Base instance.
5956
* @return error code or 0 (success)
6057
*/
6158
NUMBERS_DECLSPEC NumbersResult numbers_base_acquireinstance(Numbers_Base pBase);
62-
6359
/**
6460
* retrieves the binary version of this library.
6561
*
@@ -70,7 +66,6 @@ NUMBERS_DECLSPEC NumbersResult numbers_base_acquireinstance(Numbers_Base pBase);
7066
* @return error code or 0 (success)
7167
*/
7268
NUMBERS_DECLSPEC NumbersResult numbers_base_getversion(Numbers_Base pBase, Numbers_uint32 * pMajor, Numbers_uint32 * pMinor, Numbers_uint32 * pMicro);
73-
7469
/**
7570
* Returns the last error recorded on this object
7671
*
@@ -94,7 +89,6 @@ NUMBERS_DECLSPEC NumbersResult numbers_base_getlasterror(Numbers_Base pBase, con
9489
/*************************************************************************************************************************
9590
Global functions
9691
**************************************************************************************************************************/
97-
9892
/**
9993
* Checks whether a variable is an Instance of VariableImpl
10094
*
@@ -103,7 +97,6 @@ NUMBERS_DECLSPEC NumbersResult numbers_base_getlasterror(Numbers_Base pBase, con
10397
* @return error code or 0 (success)
10498
*/
10599
NUMBERS_DECLSPEC NumbersResult numbers_investigatevariable(Numbers_Variable pInstance, bool * pIsImpl);
106-
107100
/**
108101
* Creates a new Variable instance
109102
*
@@ -112,7 +105,6 @@ NUMBERS_DECLSPEC NumbersResult numbers_investigatevariable(Numbers_Variable pIns
112105
* @return error code or 0 (success)
113106
*/
114107
NUMBERS_DECLSPEC NumbersResult numbers_createvariable(Numbers_double dInitialValue, Numbers_Variable * pInstance);
115-
116108
/**
117109
* Creates a new Variable instance
118110
*
@@ -121,15 +113,13 @@ NUMBERS_DECLSPEC NumbersResult numbers_createvariable(Numbers_double dInitialVal
121113
* @return error code or 0 (success)
122114
*/
123115
NUMBERS_DECLSPEC NumbersResult numbers_createvariableimpl(Numbers_double dInitialValue, Numbers_VariableImpl * pInstance);
124-
125116
/**
126117
* Returns the address of the SymbolLookupMethod
127118
*
128119
* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
129120
* @return error code or 0 (success)
130121
*/
131122
NUMBERS_DECLSPEC NumbersResult numbers_getsymbollookupmethod(Numbers_pvoid * pSymbolLookupMethod);
132-
133123
/**
134124
* Returns the last error recorded on component
135125
*
@@ -140,7 +130,6 @@ NUMBERS_DECLSPEC NumbersResult numbers_getsymbollookupmethod(Numbers_pvoid * pSy
140130
* @return error code or 0 (success)
141131
*/
142132
NUMBERS_DECLSPEC NumbersResult numbers_getlasterror(const Numbers_uint32 nErrorMessageBufferSize, Numbers_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
143-
144133
/**
145134
* retrieves the binary version of this library.
146135
*

Examples/CrossComponentInheritance/Numbers_component/Bindings/CppDynamic/numbers_dynamic.h

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright (C) 2019 Numbers developers
44
55
All rights reserved.
66
7-
This file has been generated by the Automatic Component Toolkit (ACT) version 1.7.0-develop.
7+
This file has been generated by the Automatic Component Toolkit (ACT) version 2.0.0-develop.
88
99
Abstract: This is an autogenerated C++-Header file in order to allow an easy
1010
use of Numbers library
@@ -23,7 +23,6 @@ Interface version: 1.0.0
2323
/*************************************************************************************************************************
2424
Class definition for Base
2525
**************************************************************************************************************************/
26-
2726
/**
2827
* Returns the address of the SymbolLookupMethod
2928
*
@@ -72,10 +71,10 @@ typedef NumbersResult (*PNumbersBase_GetVersionPtr) (Numbers_Base pBase, Numbers
7271
*/
7372
typedef NumbersResult (*PNumbersBase_GetLastErrorPtr) (Numbers_Base pBase, const Numbers_uint32 nErrorMessageBufferSize, Numbers_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
7473

74+
7575
/*************************************************************************************************************************
7676
Class definition for Variable
7777
**************************************************************************************************************************/
78-
7978
/**
8079
* Returns the current value of this Variable
8180
*
@@ -94,14 +93,14 @@ typedef NumbersResult (*PNumbersVariable_GetValuePtr) (Numbers_Variable pVariabl
9493
*/
9594
typedef NumbersResult (*PNumbersVariable_SetValuePtr) (Numbers_Variable pVariable, Numbers_double dValue);
9695

96+
9797
/*************************************************************************************************************************
9898
Class definition for VariableImpl
9999
**************************************************************************************************************************/
100100

101101
/*************************************************************************************************************************
102102
Global functions
103103
**************************************************************************************************************************/
104-
105104
/**
106105
* Checks whether a variable is an Instance of VariableImpl
107106
*
@@ -110,7 +109,6 @@ typedef NumbersResult (*PNumbersVariable_SetValuePtr) (Numbers_Variable pVariabl
110109
* @return error code or 0 (success)
111110
*/
112111
typedef NumbersResult (*PNumbersInvestigateVariablePtr) (Numbers_Variable pInstance, bool * pIsImpl);
113-
114112
/**
115113
* Creates a new Variable instance
116114
*
@@ -119,7 +117,6 @@ typedef NumbersResult (*PNumbersInvestigateVariablePtr) (Numbers_Variable pInsta
119117
* @return error code or 0 (success)
120118
*/
121119
typedef NumbersResult (*PNumbersCreateVariablePtr) (Numbers_double dInitialValue, Numbers_Variable * pInstance);
122-
123120
/**
124121
* Creates a new Variable instance
125122
*
@@ -128,15 +125,13 @@ typedef NumbersResult (*PNumbersCreateVariablePtr) (Numbers_double dInitialValue
128125
* @return error code or 0 (success)
129126
*/
130127
typedef NumbersResult (*PNumbersCreateVariableImplPtr) (Numbers_double dInitialValue, Numbers_VariableImpl * pInstance);
131-
132128
/**
133129
* Returns the address of the SymbolLookupMethod
134130
*
135131
* @param[out] pSymbolLookupMethod - Address of the SymbolAddressMethod
136132
* @return error code or 0 (success)
137133
*/
138134
typedef NumbersResult (*PNumbersGetSymbolLookupMethodPtr) (Numbers_pvoid * pSymbolLookupMethod);
139-
140135
/**
141136
* Returns the last error recorded on component
142137
*
@@ -147,7 +142,6 @@ typedef NumbersResult (*PNumbersGetSymbolLookupMethodPtr) (Numbers_pvoid * pSymb
147142
* @return error code or 0 (success)
148143
*/
149144
typedef NumbersResult (*PNumbersGetLastErrorPtr) (const Numbers_uint32 nErrorMessageBufferSize, Numbers_uint32* pErrorMessageNeededChars, char * pErrorMessageBuffer, bool * pHasError);
150-
151145
/**
152146
* retrieves the binary version of this library.
153147
*
@@ -162,7 +156,7 @@ typedef NumbersResult (*PNumbersGetVersionPtr) (Numbers_uint32 * pMajor, Numbers
162156
Function Table Structure
163157
**************************************************************************************************************************/
164158

165-
typedef struct {
159+
typedef struct sNumbersDynamicWrapperTableStruct {
166160
void * m_LibraryHandle;
167161
PNumbersBase_GetSymbolLookupMethodPtr m_Base_GetSymbolLookupMethod;
168162
PNumbersBase_ReleaseInstancePtr m_Base_ReleaseInstance;
@@ -179,20 +173,20 @@ typedef struct {
179173
PNumbersGetVersionPtr m_GetVersion;
180174
} sNumbersDynamicWrapperTable;
181175

182-
typedef struct {
176+
typedef struct sNumbersFunctionTableBaseStruct {
183177
PNumbersBase_GetSymbolLookupMethodPtr m_Base_GetSymbolLookupMethod;
184178
PNumbersBase_ReleaseInstancePtr m_Base_ReleaseInstance;
185179
PNumbersBase_AcquireInstancePtr m_Base_AcquireInstance;
186180
PNumbersBase_GetVersionPtr m_Base_GetVersion;
187181
PNumbersBase_GetLastErrorPtr m_Base_GetLastError;
188182
} sNumbersFunctionTableBase;
189183

190-
typedef struct : sNumbersFunctionTableBase {
184+
typedef struct sNumbersFunctionTableVariableStruct : sNumbersFunctionTableBase {
191185
PNumbersVariable_GetValuePtr m_Variable_GetValue;
192186
PNumbersVariable_SetValuePtr m_Variable_SetValue;
193187
} sNumbersFunctionTableVariable;
194188

195-
typedef struct : sNumbersFunctionTableVariable {
189+
typedef struct sNumbersFunctionTableVariableImplStruct : sNumbersFunctionTableVariable {
196190
} sNumbersFunctionTableVariableImpl;
197191

198192
#endif // __NUMBERS_DYNAMICHEADER_CPPTYPES

0 commit comments

Comments
 (0)