Merge pull request #3892 from ethereum/develop

Merge develop into release for 0.4.22

1 files changed, 2 insertions, 2 deletions

diff --git a/std/StandardToken.sol b/std/StandardToken.sol
index 1b218d67..ca0658f2 100644
--- a/std/StandardToken.sol
+++ b/std/StandardToken.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.0;
+pragma solidity ^0.4.22;
 
 import "./Token.sol";
 
@@ -8,7 +8,7 @@ contract StandardToken is Token {
 	mapping (address =>
 		mapping (address => uint256)) m_allowance;
 
-	function StandardToken(address _initialOwner, uint256 _supply) public {
+	constructor(address _initialOwner, uint256 _supply) public {
 		supply = _supply;
 		balance[_initialOwner] = _supply;
 	}