Merge branch 'develop' into quickgui

alethzero/MainWin.cpp

@@ -148,7 +148,8 @@ QString Main::pretty(eth::Address _a) const
 	if (h256 n = state().contractMemory(m_nameReg, (h256)(u256)(u160)_a))
 	{
 		std::string s((char const*)n.data(), 32);
-		s.resize(s.find_first_of('\0'));
+		if (s.find_first_of('\0') != string::npos)
+			s.resize(s.find_first_of('\0'));
 		return QString::fromStdString(s);
 	}
 	return QString();

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)

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>