Merge pull request ethereum#92 from ethereum/cxx98compat

Fix compatibility with C++98
jwasinger · Aug 27, 2018 · e34ea20 · e34ea20
2 parents e7f313d + 978a640
commit e34ea20
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/include/evmc/evmc.h b/include/evmc/evmc.h
@@ -447,7 +447,7 @@ enum evmc_storage_status
     /**
      * A storage item has been deleted: X -> 0.
      */
-    EVMC_STORAGE_DELETED = 3,
+    EVMC_STORAGE_DELETED = 3
 };
 
 

diff --git a/test/integration/compilation/CMakeLists.txt b/test/integration/compilation/CMakeLists.txt
@@ -9,3 +9,11 @@ set_target_properties(test-compile-c99 PROPERTIES C_STANDARD 99 C_EXTENSIONS OFF
 add_library(test-compile-c11 STATIC ${PROJECT_SOURCE_DIR}/include/evmc/evmc.h compilation_test.c)
 target_link_libraries(test-compile-c11 PRIVATE evmc)
 set_target_properties(test-compile-c11 PROPERTIES C_STANDARD 11 C_EXTENSIONS OFF)
+
+add_library(test-compile-cxx98 STATIC compilation_test.cpp)
+target_link_libraries(test-compile-cxx98 PRIVATE evmc)
+set_target_properties(test-compile-cxx98 PROPERTIES CXX_STANDARD 98 CXX_EXTENSIONS OFF)
+
+add_library(test-compile-cxx11 STATIC compilation_test.cpp)
+target_link_libraries(test-compile-cxx11 PRIVATE evmc)
+set_target_properties(test-compile-cxx11 PROPERTIES CXX_STANDARD 11 CXX_EXTENSIONS OFF)
diff --git a/test/integration/compilation/compilation_test.cpp b/test/integration/compilation/compilation_test.cpp
@@ -0,0 +1,8 @@
+/* EVMC: Ethereum Client-VM Connector API.
+ * Copyright 2018 The EVMC Authors.
+ * Licensed under the Apache License, Version 2.0. See the LICENSE file.
+ */
+
+#include <evmc/evmc.h>
+#include <evmc/utils.h>
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -447,7 +447,7 @@ enum evmc_storage_status @@
         /**
          * A storage item has been deleted: X -> 0.
          */
-        EVMC_STORAGE_DELETED = 3,
+        EVMC_STORAGE_DELETED = 3
     };
@@ Expand Down @@