Merge remote-tracking branch 'ethereum/develop' into sol_import

Conflicts:
	libsolidity/CompilerStack.cpp
	libsolidity/CompilerStack.h
	libsolidity/InterfaceHandler.cpp
	libsolidity/InterfaceHandler.h
	solc/main.cpp
	test/solidityJSONInterfaceTest.cpp
	test/solidityNatspecJSON.cpp

1 files changed, 10 insertions, 10 deletions

diff --git a/InterfaceHandler.h b/InterfaceHandler.h
index 0eae3aaf..e6be9e6a 100644
--- a/InterfaceHandler.h
+++ b/InterfaceHandler.h
@@ -37,15 +37,15 @@ namespace solidity
 
 // Forward declarations
 class ContractDefinition;
-enum DocumentationType: unsigned short;
+enum class DocumentationType: uint8_t;
 
-enum DocTagType
+enum class DocTagType: uint8_t
 {
-	DOCTAG_NONE = 0,
-	DOCTAG_DEV,
-	DOCTAG_NOTICE,
-	DOCTAG_PARAM,
-	DOCTAG_RETURN
+	NONE = 0,
+	DEV,
+	NOTICE,
+	PARAM,
+	RETURN
 };
 
 class InterfaceHandler
@@ -60,7 +60,7 @@ public:
 	/// @return             A unique pointer contained string with the json
 	///                     representation of provided type
 	std::unique_ptr<std::string> getDocumentation(ContractDefinition& _contractDef,
-												  enum DocumentationType _type);
+												  DocumentationType _type);
 	/// Get the ABI Interface of the contract
 	/// @param _contractDef The contract definition
 	/// @return             A unique pointer contained string with the json
@@ -84,7 +84,7 @@ private:
 	std::string::const_iterator parseDocTagLine(std::string::const_iterator _pos,
 												std::string::const_iterator _end,
 												std::string& _tagString,
-												enum DocTagType _tagType);
+												DocTagType _tagType);
 	std::string::const_iterator parseDocTagParam(std::string::const_iterator _pos,
 												 std::string::const_iterator _end);
 	std::string::const_iterator appendDocTagParam(std::string::const_iterator _pos,
@@ -99,7 +99,7 @@ private:
 	Json::StyledWriter m_writer;
 
 	// internal state
-	enum DocTagType m_lastTag;
+	DocTagType m_lastTag;
 	std::string m_notice;
 	std::string m_dev;
 	std::string m_return;