Browse Source

Merge pull request #1112 from imapp-pl/pr/evmjit-v0.2

Fixing EVMJIT build on Mac OS
cl-refactor
Gav Wood 10 years ago
parent
commit
d00ae2b468
  1. 1
      evmjit/libevmjit/ExecStats.h
  2. 2
      evmjit/libevmjit/preprocessor/llvm_includes_end.h
  3. 4
      evmjit/libevmjit/preprocessor/llvm_includes_start.h

1
evmjit/libevmjit/ExecStats.h

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <string>
#include <chrono> #include <chrono>
#include "ExecutionEngine.h" #include "ExecutionEngine.h"

2
evmjit/libevmjit/preprocessor/llvm_includes_end.h

@ -1,5 +1,7 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(pop) #pragma warning(pop)
#elif defined(__clang__)
#pragma clang diagnostic pop
#else #else
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

4
evmjit/libevmjit/preprocessor/llvm_includes_start.h

@ -1,6 +1,10 @@
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4267 4244 4800) #pragma warning(disable: 4267 4244 4800)
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-parameter
#pragma clang diagnostic ignored "-Wconversion"
#else #else
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"

Loading…
Cancel
Save