mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge remote-tracking branch 'upstream/develop' into evmjit
This commit is contained in:
commit
c82b085d93
@ -30,6 +30,6 @@ target_link_libraries(${EXECUTABLE} evmcore)
|
||||
target_link_libraries(${EXECUTABLE} devcore)
|
||||
target_link_libraries(${EXECUTABLE} devcrypto)
|
||||
|
||||
install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
|
||||
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
|
||||
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
|
||||
|
||||
|
1
Token.h
1
Token.h
@ -46,6 +46,7 @@
|
||||
#include <libdevcore/Log.h>
|
||||
#include <libsolidity/Utils.h>
|
||||
#include <libsolidity/Exceptions.h>
|
||||
#include <libdevcore/UndefMacros.h>
|
||||
|
||||
namespace dev
|
||||
{
|
||||
|
2
Types.h
2
Types.h
@ -30,6 +30,7 @@
|
||||
#include <libsolidity/Exceptions.h>
|
||||
#include <libsolidity/ASTForward.h>
|
||||
#include <libsolidity/Token.h>
|
||||
#include <libdevcore/UndefMacros.h>
|
||||
|
||||
namespace dev
|
||||
{
|
||||
@ -67,7 +68,6 @@ private:
|
||||
MemberMap m_memberTypes;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Abstract base class that forms the root of the type hierarchy.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user