Merge branch 'release/6.1'

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 6.1.0
+current_version = 6.1.1
 tag = True
 commit = True
 message = EVMC {new_version}

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [6.1.1] - 2019-02-13
+
+- Added: [[#192](https://github.com/ethereum/evmc/pull/192)]
+  Documentation of elements of evmc_revision.
+- Fixed: [[#190](https://github.com/ethereum/evmc/pull/190)]
+  Compilation with GCC 5 because of the "deprecated" attribute applied
+  to an enum element.
+
 ## [6.1.0] - 2019-01-24
 
 - Added: [[#174](https://github.com/ethereum/evmc/pull/174)]
@@ -103,6 +111,7 @@
   Constantinople: Storage status is reported back from `evmc_set_storage()`.
 
 
+[6.1.1]: https://github.com/ethereum/evmc/releases/tag/v6.1.1
 [6.1.0]: https://github.com/ethereum/evmc/releases/tag/v6.1.0
 [6.0.2]: https://github.com/ethereum/evmc/releases/tag/v6.0.2
 [6.0.1]: https://github.com/ethereum/evmc/releases/tag/v6.0.1

CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 cable_configure_toolchain(DEFAULT cxx11-pic)
 
 project(evmc)
-set(PROJECT_VERSION 6.1.0)
+set(PROJECT_VERSION 6.1.1)
 
 cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Debug Release)
 

include/evmc/evmc.h

@@ -11,13 +11,15 @@
 #ifndef EVMC_H
 #define EVMC_H
 
-#ifdef __has_attribute
-#if __has_attribute(deprecated)
+#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ >= 6)
+/**
+ * Portable declaration of "deprecated" attribute.
+ *
+ * Available for clang and GCC 6+ compilers. The older GCC compilers know
+ * this attribute, but it cannot be applied to enum elements.
+ */
 #define EVMC_DEPRECATED __attribute__((deprecated))
-#endif
-#endif
-
-#ifndef EVMC_DEPRECATED
+#else
 #define EVMC_DEPRECATED
 #endif
 
@@ -706,24 +708,66 @@ typedef enum evmc_set_option_result (*evmc_set_option_fn)(struct evmc_instance*
 /**
  * EVM revision.
  *
- *  The revision of the EVM specification based on the Ethereum
- *  upgrade / hard fork codenames.
+ * The revision of the EVM specification based on the Ethereum
+ * upgrade / hard fork codenames.
  */
 enum evmc_revision
 {
+    /**
+     * The Frontier revision.
+     *
+     * The one Ethereum launched with.
+     */
     EVMC_FRONTIER = 0,
+
+    /**
+     * The Homestead revision.
+     *
+     * https://eips.ethereum.org/EIPS/eip-606
+     */
     EVMC_HOMESTEAD = 1,
+
+    /**
+     * The Tangerine Whistle revision.
+     *
+     * https://eips.ethereum.org/EIPS/eip-608
+     */
     EVMC_TANGERINE_WHISTLE = 2,
+
+    /**
+     * The Spurious Dragon revision.
+     *
+     * https://eips.ethereum.org/EIPS/eip-607
+     */
     EVMC_SPURIOUS_DRAGON = 3,
+
+    /**
+     * The Byzantium revision.
+     *
+     * https://eips.ethereum.org/EIPS/eip-609
+     */
     EVMC_BYZANTIUM = 4,
+
+    /**
+     * The Constantinople revision.
+     *
+     * https://eips.ethereum.org/EIPS/eip-1013
+     */
     EVMC_CONSTANTINOPLE = 5,
 
     /**
      * Reserved for the post-Constantinople upgrade. The name is likely to
      * be changed, but the assigned number should stay.
+     *
+     * The spec draft: https://github.com/ethereum/EIPs/pull/1716.
      */
     EVMC_CONSTANTINOPLE2 = 6,
 
+    /**
+     * The Istanbul revision.
+     *
+     * The spec draft: https://eips.ethereum.org/EIPS/eip-1679.
+     */
     EVMC_ISTANBUL = 7,
 
     /** The maximum EVM revision supported. */