Skip to content

Commit 9f7eacc

Browse files
authored
Merge pull request #4 from germin8/master
Provide functionality for GCC 4.7+
2 parents 10eaf9f + 8647f9d commit 9f7eacc

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

src/VariableTimedAction.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
int VariableTimedAction::maxActions;
1010
VariableTimedAction ** VariableTimedAction::actions;
1111

12-
void VariableTimedAction::start(unsigned long startInterval, bool startNow = true) {
12+
void VariableTimedAction::start(unsigned long startInterval, bool startNow) {
1313
static bool init = false;
1414
if (!init) {
1515
maxActions = 15;
16-
actions = new VariableTimedAction*[maxActions](NULL); //start at 15 actions, increase as needed
16+
actions = new VariableTimedAction*[maxActions]; //start at 15 actions, increase as needed
17+
for (int i = 0; i < maxActions; i++) {
18+
actions[i] = NULL;
19+
}
1720
init = true;
1821
}
1922

@@ -30,7 +33,10 @@ void VariableTimedAction::start(unsigned long startInterval, bool startNow = tru
3033
emptyIndex = maxActions;
3134
int previousMax = maxActions;
3235
maxActions += 5;
33-
VariableTimedAction ** newArray = new VariableTimedAction*[maxActions](NULL);
36+
VariableTimedAction ** newArray = new VariableTimedAction*[maxActions];
37+
for (int i = previousMax; i < maxActions; i++) {
38+
newArray[i] = NULL;
39+
}
3440
for (int i = 0; i < previousMax; i++) {
3541
newArray[i] = actions[i];
3642
}
@@ -82,7 +88,7 @@ void VariableTimedAction::update() {
8288
}
8389
}
8490

85-
static void VariableTimedAction::updateActions() {
91+
void VariableTimedAction::updateActions() {
8692
for (int i = 0; i < maxActions; i++) {
8793
if (actions[i] != NULL) {
8894
actions[i]->update();

0 commit comments

Comments
 (0)