Merge pull request #2802 from ethereum/develop

Merge develop into release for 0.4.16

1 files changed, 4 insertions, 4 deletions

diff --git a/libsolidity/interface/ReadFile.h b/libsolidity/interface/ReadFile.h
index 2e8a6bd8..7068629d 100644
--- a/libsolidity/interface/ReadFile.h
+++ b/libsolidity/interface/ReadFile.h
@@ -27,17 +27,17 @@ namespace dev
 namespace solidity
 {
 
-class ReadFile: boost::noncopyable
+class ReadCallback: boost::noncopyable
 {
 public:
-	/// File reading result.
+	/// File reading or generic query result.
 	struct Result
 	{
 		bool success;
-		std::string contentsOrErrorMessage;
+		std::string responseOrErrorMessage;
 	};
 
-	/// File reading callback.
+	/// File reading or generic query callback.
 	using Callback = std::function<Result(std::string const&)>;
 };