Deukhoofd
/
PorygonLang
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed references of u_int64_t to uint64_t, to account for mingw
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2019-06-13 15:31:48 +02:00
parent 9d5c6911b2
commit e93bcab14d
No known key found for this signature in database
GPG Key ID: B4C087AC81641654
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Binder/BoundVariables/BoundVariableKey.hpp
View File

@ -10,11 +10,11 @@ class BoundVariableKey{
int _identifier; int _identifier;
unsigned int _scopeId; unsigned int _scopeId;
bool _isCreation; bool _isCreation;
u_int64_t _hash; uint64_t _hash;
static u_int64_t KnuthsHash(int i1, int i2) static uint64_t KnuthsHash(int i1, int i2)
{ {
u_int64_t ret = i1; uint64_t ret = i1;
ret *= 2654435761U; ret *= 2654435761U;
return ret ^ i2; return ret ^ i2;
} }
@ -39,7 +39,7 @@ public:
return _isCreation; return _isCreation;
} }
u_int64_t GetHash(){ uint64_t GetHash(){
return _hash; return _hash;
} }
}; };

2
src/Evaluator/EvaluationScope/EvaluationScope.cpp
View File

@ -4,7 +4,7 @@
EvaluationScope::EvaluationScope(unordered_map<size_t, shared_ptr<EvalValue>> *scriptVariables, int deepestScope) { EvaluationScope::EvaluationScope(unordered_map<size_t, shared_ptr<EvalValue>> *scriptVariables, int deepestScope) {
_scriptScope = scriptVariables; _scriptScope = scriptVariables;
_localScope = unordered_map<u_int64_t, shared_ptr<EvalValue>>(deepestScope); _localScope = unordered_map<uint64_t, shared_ptr<EvalValue>>(deepestScope);
} }
void EvaluationScope::CreateVariable(BoundVariableKey* key, const shared_ptr<EvalValue> &value) { void EvaluationScope::CreateVariable(BoundVariableKey* key, const shared_ptr<EvalValue> &value) {

2
src/Evaluator/EvaluationScope/EvaluationScope.hpp
View File

@ -8,7 +8,7 @@
class EvaluationScope { class EvaluationScope {
unordered_map<size_t, shared_ptr<EvalValue>>* _scriptScope; unordered_map<size_t, shared_ptr<EvalValue>>* _scriptScope;
unordered_map<u_int64_t, shared_ptr<EvalValue>> _localScope; unordered_map<uint64_t, shared_ptr<EvalValue>> _localScope;
public: public:
explicit EvaluationScope(unordered_map<size_t, shared_ptr<EvalValue>>* scriptVariables, int deepestScope); explicit EvaluationScope(unordered_map<size_t, shared_ptr<EvalValue>>* scriptVariables, int deepestScope);
~EvaluationScope() = default; ~EvaluationScope() = default;