Browse Source

Merge branch 'release-poc-3' of github.com:ethereum/cpp-ethereum into release-poc-3

cl-refactor
Gav Wood 11 years ago
parent
commit
e2f90d5104
  1. 4
      libethereum/Instruction.cpp
  2. 2
      windows/LibEthereum.props

4
libethereum/Instruction.cpp

@ -499,7 +499,7 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
while (d != e && compileLispFragment(d, e, _quiet, codes.back().first, codes.back().second))
codes.push_back(pair<u256s, vector<unsigned>>());
codes.pop_back();
int i = codes.size();
int i = (int)codes.size();
if (i > 2)
cwarn << "Greater than two arguments given to binary operator" << t << "; using first two only.";
for (auto it = codes.rbegin(); it != codes.rend(); ++it)
@ -518,7 +518,7 @@ static bool compileLispFragment(char const*& d, char const* e, bool _quiet, u256
while (d != e && compileLispFragment(d, e, _quiet, codes.back().first, codes.back().second))
codes.push_back(pair<u256s, vector<unsigned>>());
codes.pop_back();
int i = codes.size();
int i = (int)codes.size();
if (i > 1)
cwarn << "Greater than one argument given to unary operator" << t << "; using first only.";
for (auto it = codes.rbegin(); it != codes.rend(); ++it)

2
windows/LibEthereum.props

@ -10,7 +10,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<DisableSpecificWarnings>4100;4127;4258;4505;4512;4706</DisableSpecificWarnings>
<DisableSpecificWarnings>4068;4100;4127;4258;4505;4512;4706</DisableSpecificWarnings>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<MinimalRebuild>false</MinimalRebuild>

Loading…
Cancel
Save