@@ -33,27 +33,25 @@ DefaultEffector* DefaultEffector :: NewDefaultEffector(){
3333bool DefaultEffector :: MergeEffects(string expr, vector<Effect> effects, vector<float > results) {
3434 bool result;
3535
36- unsigned int number_of_effects = sizeof (effects) / sizeof (effects[0 ]);
37-
3836 if (!expr.compare (" some(where (p_eft == allow))" )) {
3937 result = false ;
40- for (unsigned int index = 0 ; index < number_of_effects ; index++){
38+ for (unsigned int index = 0 ; index < effects. size () ; index++){
4139 if (effects[index] == Effect::Allow) {
4240 result = true ;
4341 break ;
4442 }
4543 }
4644 } else if (!expr.compare (" !some(where (p_eft == deny))" )) {
4745 result = true ;
48- for (unsigned int index = 0 ; index < number_of_effects ; index++){
46+ for (unsigned int index = 0 ; index < effects. size () ; index++){
4947 if (effects[index] == Effect::Deny) {
5048 result = false ;
5149 break ;
5250 }
5351 }
5452 } else if (!expr.compare (" some(where (p_eft == allow)) && !some(where (p_eft == deny))" )) {
5553 result = false ;
56- for (unsigned int index = 0 ; index < number_of_effects ; index++){
54+ for (unsigned int index = 0 ; index < effects. size () ; index++){
5755 if (effects[index] == Effect::Allow) {
5856 result = true ;
5957 } else if (effects[index] == Effect::Deny) {
@@ -63,7 +61,7 @@ bool DefaultEffector :: MergeEffects(string expr, vector<Effect> effects, vector
6361 }
6462 } else if (!expr.compare (" priority(p_eft) || deny" )) {
6563 result = false ;
66- for (unsigned int index = 0 ; index < number_of_effects ; index++){
64+ for (unsigned int index = 0 ; index < effects. size () ; index++){
6765 if (effects[index] != Effect::Indeterminate) {
6866 if (effects[index] == Effect::Allow) {
6967 result = true ;
0 commit comments