Skip to content

Commit

Permalink
Merge pull request #92 from oraclize/fix/natspec-doxygen-bug
Browse files Browse the repository at this point in the history
fix/natspec doxygen bug
  • Loading branch information
gskapka authored Jun 25, 2019
2 parents ce80fb7 + d02497b commit 831f412
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions oraclizeAPI_0.4.25.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ contract usingOraclize {
return oraclize_randomDS_sessionKeysHashVerified[sessionPubkeyHash];
}

// the following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
// the following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
function copyBytes(bytes from, uint fromOffset, uint length, bytes to, uint toOffset) internal pure returns (bytes) {
uint minLength = length + toOffset;

Expand All @@ -1161,7 +1161,7 @@ contract usingOraclize {
return to;
}

// the following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
// the following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
// Duplicate Solidity's ecrecover, but catching the CALL return value
function safer_ecrecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) internal returns (bool, address) {
// We do our own memory management here. Solidity uses memory offset
Expand Down Expand Up @@ -1190,7 +1190,7 @@ contract usingOraclize {
return (ret, addr);
}

// the following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
// the following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
function ecrecovery(bytes32 hash, bytes sig) internal returns (bool, address) {
bytes32 r;
bytes32 s;
Expand Down
6 changes: 3 additions & 3 deletions oraclizeAPI_0.4.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ contract usingOraclize {
}


// the following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
// the following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
function copyBytes(bytes from, uint fromOffset, uint length, bytes to, uint toOffset) internal returns (bytes) {
uint minLength = length + toOffset;

Expand All @@ -1163,7 +1163,7 @@ contract usingOraclize {
return to;
}

// the following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
// the following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
// Duplicate Solidity's ecrecover, but catching the CALL return value
function safer_ecrecover(bytes32 hash, uint8 v, bytes32 r, bytes32 s) internal returns (bool, address) {
// We do our own memory management here. Solidity uses memory offset
Expand Down Expand Up @@ -1192,7 +1192,7 @@ contract usingOraclize {
return (ret, addr);
}

// the following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
// the following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
function ecrecovery(bytes32 hash, bytes sig) internal returns (bool, address) {
bytes32 r;
bytes32 s;
Expand Down
6 changes: 3 additions & 3 deletions oraclizeAPI_0.5.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ contract usingOraclize {
return oraclize_randomDS_sessionKeysHashVerified[sessionPubkeyHash];
}
/*
The following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
The following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
*/
function copyBytes(bytes memory _from, uint _fromOffset, uint _length, bytes memory _to, uint _toOffset) internal pure returns (bytes memory _copiedBytes) {
uint minLength = _length + _toOffset;
Expand All @@ -1262,7 +1262,7 @@ contract usingOraclize {
return _to;
}
/*
The following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
The following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
Duplicate Solidity's ecrecover, but catching the CALL return value
*/
function safer_ecrecover(bytes32 _hash, uint8 _v, bytes32 _r, bytes32 _s) internal returns (bool _success, address _recoveredAddress) {
Expand All @@ -1288,7 +1288,7 @@ contract usingOraclize {
return (ret, addr);
}
/*
The following function has been written by Alex Beregszaszi (@axic), use it under the terms of the MIT license
The following function has been written by Alex Beregszaszi, use it under the terms of the MIT license
*/
function ecrecovery(bytes32 _hash, bytes memory _sig) internal returns (bool _success, address _recoveredAddress) {
bytes32 r;
Expand Down

1 comment on commit 831f412

@D-Nice
Copy link
Contributor

@D-Nice D-Nice commented on 831f412 Jun 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some git failure apparently caused CI to fail.

ERROR: Failed to create usr/libexec/git-core/git-credential-store: I/O error
--
4 | ERROR: git-2.20.1-r0: IO ERROR

Will create an ad-hoc container which has the setup steps already resolved to counteract this as per our roadmap

Please sign in to comment.