cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop_060

Browse Source
This commit is contained in:
chriseth 2019-10-05 13:08:44 +02:00
commit cea6d6df8b
7 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/EthCompilerSettings.cmake
View File

@ -23,6 +23,9 @@ endif()
eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough) eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough)
# Prevent the path of the source directory from ending up in the binary via __FILE__ macros.
eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=/solidity")
if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")) if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
# Enables all the warnings about constructions that some users consider questionable, # Enables all the warnings about constructions that some users consider questionable,
# and that are easy to avoid. Also enable some extra warning flags that are not # and that are easy to avoid. Also enable some extra warning flags that are not

5
docs/common-patterns.rst
View File

@ -22,9 +22,8 @@ a contract where the goal is to send the most money to the
contract in order to become the "richest", inspired by contract in order to become the "richest", inspired by
`King of the Ether <https://www.kingoftheether.com/>`_. `King of the Ether <https://www.kingoftheether.com/>`_.
In the following contract, if you are usurped as the richest, In the following contract, if you are no longer the richest,
you will receive the funds of the person who has gone on to you receive the funds of the person who is now the richest.
become the new richest.
:: ::

2
test/libsolidity/ASTJSON/enum_value.sol
View File

@ -1 +1,3 @@
contract C { enum E { A, B } } contract C { enum E { A, B } }
// ----

2
test/libsolidity/ASTJSON/event_definition.sol
View File

@ -1 +1,3 @@
contract C { event E(); } contract C { event E(); }
// ----

2
test/libsolidity/ASTJSON/placeholder_statement.sol
View File

@ -1 +1,3 @@
contract C { modifier M { _; } } contract C { modifier M { _; } }
// ----

2
test/libsolidity/ASTJSON/smoke.sol
View File

@ -1 +1,3 @@
contract C {} contract C {}
// ----

2
test/libsolidity/ASTJSON/using_for_directive.sol
View File

@ -1 +1,3 @@
library L {} contract C { using L for uint; } library L {} contract C { using L for uint; }
// ----