Skip to content

Commit b24ac14

Browse files
dorin-gadorin-ga
committed
fix extern interface
1 parent 6b2357d commit b24ac14

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

‎source/gameanalytics/GameAnalyticsExtern.cpp‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
#include "GameAnalytics/GameAnalytics.h"
44
#include "GAUtilities.h"
5+
#include "GameAnalyticsExtern.h"
56

6-
StringVector makeStringVector(const char** arr, int size)
7+
gameanalytics::StringVector makeStringVector(const char** arr, int size)
78
{
89
if(size > 0 && arr)
910
{
10-
StringVector v;
11+
gameanalytics::StringVector v;
1112
v.reserve(size);
1213

1314
for(int i = 0; i < size; ++i)
@@ -35,7 +36,7 @@ GAErrorCode copyStringBuffer(std::string const& s, char* out, int* size)
3536
return EGABufferError;
3637
}
3738

38-
*size = s.size();
39+
*size = static_cast<int>(s.size());
3940
return EGANoError;
4041
}
4142

@@ -44,31 +45,31 @@ GAErrorCode copyStringBuffer(std::string const& s, char* out, int* size)
4445

4546
void gameAnalytics_configureAvailableCustomDimensions01(const char **customDimensions, int size)
4647
{
47-
StringVector values = makeStringVector(customDimensions, size);
48+
gameanalytics::StringVector values = makeStringVector(customDimensions, size);
4849
gameanalytics::GameAnalytics::configureAvailableCustomDimensions01(values);
4950
}
5051

5152
void gameAnalytics_configureAvailableCustomDimensions02(const char **customDimensions, int size)
5253
{
53-
StringVector values = makeStringVector(customDimensions, size);
54+
gameanalytics::StringVector values = makeStringVector(customDimensions, size);
5455
gameanalytics::GameAnalytics::configureAvailableCustomDimensions02(values);
5556
}
5657

5758
void gameAnalytics_configureAvailableCustomDimensions03(const char **customDimensions, int size)
5859
{
59-
StringVector values = makeStringVector(customDimensions, size);
60+
gameanalytics::StringVector values = makeStringVector(customDimensions, size);
6061
gameanalytics::GameAnalytics::configureAvailableCustomDimensions03(values);
6162
}
6263

6364
void gameAnalytics_configureAvailableResourceCurrencies(const char** currencies, int size)
6465
{
65-
StringVector values = makeStringVector(currencies, size);
66+
gameanalytics::StringVector values = makeStringVector(currencies, size);
6667
gameanalytics::GameAnalytics::configureAvailableResourceCurrencies(values);
6768
}
6869

6970
void gameAnalytics_configureAvailableResourceItemTypes(const char** resources, int size)
7071
{
71-
StringVector values = makeStringVector(resources, size);
72+
gameanalytics::StringVector values = makeStringVector(resources, size);
7273
gameanalytics::GameAnalytics::configureAvailableResourceItemTypes(values);
7374
}
7475

@@ -138,9 +139,9 @@ void gameAnalytics_addProgressionEvent(int progressionStatus, const char *progre
138139
gameanalytics::GameAnalytics::addProgressionEvent((gameanalytics::EGAProgressionStatus)progressionStatus, progression01, progression02, progression03, fields, mergeFields);
139140
}
140141

141-
void gameAnalytics_addProgressionEventWithScore(int progressionStatus, const char *progression01, const char *progression02, const char *progression03, double score, const char *fields, GAStatus mergeFields)
142+
void gameAnalytics_addProgressionEventWithScore(int progressionStatus, const char *progression01, const char *progression02, const char *progression03, int score, const char *fields, GAStatus mergeFields)
142143
{
143-
gameanalytics::GameAnalytics::addProgressionEvent((gameanalytics::EGAProgressionStatus)progressionStatus, progression01, progression02, progression03, (int)score, fields, mergeFields);
144+
gameanalytics::GameAnalytics::addProgressionEvent((gameanalytics::EGAProgressionStatus)progressionStatus, score, progression01, progression02, progression03, fields, mergeFields);
144145
}
145146

146147
void gameAnalytics_addDesignEvent(const char *eventId, const char *fields, GAStatus mergeFields)
@@ -233,7 +234,7 @@ void gameAnalytics_onQuit()
233234
gameanalytics::GameAnalytics::onQuit();
234235
}
235236

236-
void gameAnalytics_getRemoteConfigsValueAsString(const char *key, char* out, int* size)
237+
GAErrorCode gameAnalytics_getRemoteConfigsValueAsString(const char *key, char* out, int* size)
237238
{
238239
std::string returnValue = gameanalytics::GameAnalytics::getRemoteConfigsValueAsString(key);
239240
return copyStringBuffer(returnValue, out, size);
@@ -247,7 +248,7 @@ GAErrorCode gameAnalytics_getRemoteConfigsValueAsStringWithDefaultValue(const ch
247248

248249
GAStatus gameAnalytics_isRemoteConfigsReady()
249250
{
250-
return gameanalytics::GameAnalytics::isRemoteConfigsReady() ? GAEnabled : GADisabled;
251+
return gameanalytics::GameAnalytics::isRemoteConfigsReady() ? EGAEnabled : EGADisabled;
251252
}
252253

253254
GAErrorCode gameAnalytics_getRemoteConfigsContentAsString(char* out, int* size)
@@ -256,9 +257,9 @@ GAErrorCode gameAnalytics_getRemoteConfigsContentAsString(char* out, int* size)
256257
return copyStringBuffer(returnValue, out, size);
257258
}
258259

259-
GAErrorCode gameAnalytics_getRemoteConfigsValueAsJson(char* out, int* size)
260+
GAErrorCode gameAnalytics_getRemoteConfigsValueAsJson(const char* key, char* out, int* size)
260261
{
261-
std::string returnValue = gameanalytics::GameAnalytics::getRemoteConfigsContentAsJson();
262+
std::string returnValue = gameanalytics::GameAnalytics::getRemoteConfigsValueAsJson(key);
262263
return copyStringBuffer(returnValue, out, size);
263264
}
264265

@@ -289,9 +290,9 @@ long long gameAnalytics_getElapsedTimeForPreviousSession()
289290
return gameanalytics::GameAnalytics::getElapsedTimeForPreviousSession();
290291
}
291292

292-
void gameAnalytics_enableSDKInit(GAStatus status)
293+
void gameAnalytics_enableSDKInitEvent(GAStatus status)
293294
{
294-
return gameanalytics::GameAnalytics::enableSDKInit(status);
295+
return gameanalytics::GameAnalytics::enableSDKInitEvent(status);
295296
}
296297

297298
void gameAnalytics_enableMemoryHistogram(GAStatus status)
@@ -301,7 +302,7 @@ void gameAnalytics_enableMemoryHistogram(GAStatus status)
301302

302303
void gameAnalytics_enableFPSHistogram(GAFpsTracker tracker, GAStatus status)
303304
{
304-
gameanaltics::FpsTracker fpsTracker =
305+
gameanalytics::FPSTracker fpsTracker =
305306
[=]() -> float
306307
{
307308
return tracker();

‎source/gameanalytics/GameAnalyticsExtern.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ GA_EXPORT void gameAnalytics_initialize(const char *gameKey, const char *gameSec
6060
GA_EXPORT void gameAnalytics_addBusinessEvent(const char *currency, double amount, const char *itemType, const char *itemId, const char *cartType, const char *customFields, GAStatus mergeFields);
6161
GA_EXPORT void gameAnalytics_addResourceEvent(int flowType, const char *currency, double amount, const char *itemType, const char *itemId, const char *customFields, GAStatus mergeFields);
6262
GA_EXPORT void gameAnalytics_addProgressionEvent(int progressionStatus, const char *progression01, const char *progression02, const char *progression03, const char *customFields, GAStatus mergeFields);
63-
GA_EXPORT void gameAnalytics_addProgressionEventWithScore(int progressionStatus, const char *progression01, const char *progression02, const char *progression03, double score, const char *customFields, GAStatus mergeFields);
63+
GA_EXPORT void gameAnalytics_addProgressionEventWithScore(int progressionStatus, const char *progression01, const char *progression02, const char *progression03, int score, const char *customFields, GAStatus mergeFields);
6464
GA_EXPORT void gameAnalytics_addDesignEvent(const char *eventId, const char *customFields, GAStatus mergeFields);
6565
GA_EXPORT void gameAnalytics_addDesignEventWithValue(const char *eventId, double value, const char *customFields, GAStatus mergeFields);
6666
GA_EXPORT void gameAnalytics_addErrorEvent(int severity, const char *message, const char *customFields, GAStatus mergeFields);
@@ -87,11 +87,12 @@ GA_EXPORT void gameAnalytics_onResume();
8787
GA_EXPORT void gameAnalytics_onSuspend();
8888
GA_EXPORT void gameAnalytics_onQuit();
8989

90-
GA_EXPORT GAErrorCode gameAnalytics_getRemoteConfigsValueAsString(const char *key, char* out, int* bufferSize);
90+
GA_EXPORT GAErrorCode gameAnalytics_getRemoteConfigsValueAsString(const char *key, char* out, int* size);
9191
GA_EXPORT GAErrorCode gameAnalytics_getRemoteConfigsValueAsStringWithDefaultValue(const char *key, const char *defaultValue, char* out, int* bufferSize);
92+
GA_EXPORT GAErrorCode gameAnalytics_getRemoteConfigsValueAsJson(const char* key, char* out, int* size);
93+
9294
GA_EXPORT GAStatus gameAnalytics_isRemoteConfigsReady();
9395
GA_EXPORT GAErrorCode gameAnalytics_getRemoteConfigsContentAsString(char* out, int* size);
94-
GA_EXPORT GAErrorCode gameAnalytics_getRemoteConfigsValueAsJson(char* out, int* size);
9596

9697
GA_EXPORT GAErrorCode gameAnalytics_getABTestingId(char* out, int* size);
9798
GA_EXPORT GAErrorCode gameAnalytics_getABTestingVariantId(char* out, int* size);
@@ -100,7 +101,7 @@ GA_EXPORT long long gameAnalytics_getElapsedSessionTime();
100101
GA_EXPORT long long gameAnalytics_getElapsedTimeFromAllSessions();
101102
GA_EXPORT long long gameAnalytics_getElapsedTimeForPreviousSession();
102103

103-
GA_EXPORT void gameAnalytics_enableSDKInit(GAStatus status);
104+
GA_EXPORT void gameAnalytics_enableSDKInitEvent(GAStatus status);
104105
GA_EXPORT void gameAnalytics_enableMemoryHistogram(GAStatus status);
105106
GA_EXPORT void gameAnalytics_enableFPSHistogram(GAFpsTracker tracker, GAStatus status);
106107
GA_EXPORT void gameAnalytics_enableHardwareTracking(GAStatus status);

0 commit comments

Comments
 (0)