Skip to content

Commit f405223

Browse files
committed
DefaultRoleManager added.
DefaultRoleManager added. Removed unnecessary includeFiles. Made changes in ordered to unorder_map, enum to enum-class and declaring iterators inside for loop. h to hpp
1 parent 0ebdb4b commit f405223

14 files changed

+331
-29
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ StyleCopReport.xml
8585
*.tmp
8686
*.tmp_proj
8787
*_wpftmp.csproj
88-
*.log
88+
# *.log
8989
*.vspscc
9090
*.vssscc
9191
.builds

src/effect/DefaultEffector.h renamed to src/effect/DefaultEffector.hpp

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
#include <string>
2-
3-
#include "Effect.h"
4-
#include "Effector.h"
5-
#include "exception/UnsupportedOperationException.h"
1+
#include "Effect.hpp"
2+
#include "Effector.hpp"
3+
#include "exception/UnsupportedOperationException.hpp"
64

75
/**
86
* DefaultEffector is default effector for Casbin.
@@ -20,34 +18,34 @@ class DefaultEffector : public Effector{
2018
if (!expr.compare("some(where (p_eft == allow))")) {
2119
result = false;
2220
for(unsigned int index = 0 ; index < number_of_effects ; index++){
23-
if (effects[index] == Allow) {
21+
if (effects[index] == Effect::Allow) {
2422
result = true;
2523
break;
2624
}
2725
}
2826
} else if (!expr.compare("!some(where (p_eft == deny))")) {
2927
result = true;
3028
for(unsigned int index = 0 ; index < number_of_effects ; index++){
31-
if (effects[index] == Deny) {
29+
if (effects[index] == Effect::Deny) {
3230
result = false;
3331
break;
3432
}
3533
}
3634
} else if (!expr.compare("some(where (p_eft == allow)) && !some(where (p_eft == deny))")) {
3735
result = false;
3836
for(unsigned int index = 0 ; index < number_of_effects ; index++){
39-
if (effects[index] == Allow) {
37+
if (effects[index] == Effect::Allow) {
4038
result = true;
41-
} else if (effects[index] == Deny) {
39+
} else if (effects[index] == Effect::Deny) {
4240
result = false;
4341
break;
4442
}
4543
}
4644
} else if (!expr.compare("priority(p_eft) || deny")) {
4745
result = false;
4846
for(unsigned int index = 0 ; index < number_of_effects ; index++){
49-
if (effects[index] != Indeterminate) {
50-
if (effects[index] == Allow) {
47+
if (effects[index] != Effect::Indeterminate) {
48+
if (effects[index] == Effect::Allow) {
5149
result = true;
5250
} else {
5351
result = false;

src/effect/Effect.h

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/effect/Effect.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
enum class Effect{
2+
Allow, Indeterminate, Deny
3+
};
4+
5+
typedef enum class Effect Effect;

src/effect/Effector.h renamed to src/effect/Effector.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <string>
22

3-
#include "Effect.h"
3+
#include "Effect.hpp"
44

55
/**
66
* Effector is the abstract class for Casbin effectors.

src/log/DefaultLogger.h renamed to src/log/DefaultLogger.hpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
#include <string>
2-
3-
#include "Logger.h"
4-
#include "Log.h"
1+
#include "Logger.hpp"
2+
#include "Log.hpp"
53

64
class DefaultLogger : public Logger{
7-
private:
8-
bool enable;
9-
105
public:
6+
117
void EnableLog(bool enable) {
128
this->enable = enable;
139
}
File renamed without changes.

src/log/LogUtil.h renamed to src/log/LogUtil.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#include <string>
2-
3-
#include "DefaultLogger.h"
4-
#include "Logger.h"
1+
#include "DefaultLogger.hpp"
52

63
class LogUtil{
74
private:

0 commit comments

Comments
 (0)