Browse Source

Language-disable fix.

cl-refactor
Gav Wood 10 years ago
parent
commit
e67f7dcf95
  1. 12
      libweb3jsonrpc/WebThreeStubServerBase.cpp

12
libweb3jsonrpc/WebThreeStubServerBase.cpp

@ -26,9 +26,11 @@
#include <jsonrpccpp/common/exception.h>
#include <libdevcore/CommonData.h>
#if ETH_SOLIDITY
#include <libsolidity/CompilerStack.h>
#include <libsolidity/Scanner.h>
#include <libsolidity/SourceReferenceFormatter.h>
#endif
#include <libevmcore/Instruction.h>
#include <liblll/Compiler.h>
#include <libethereum/Client.h>
@ -36,7 +38,7 @@
#include <libethcore/CommonJS.h>
#include <libwhisper/Message.h>
#include <libwhisper/WhisperHost.h>
#ifndef _MSC_VER
#if ETH_SERPENT
#include <libserpent/funcs.h>
#endif
#include "WebThreeStubServerBase.h"
@ -620,8 +622,10 @@ Json::Value WebThreeStubServerBase::eth_getCompilers()
{
Json::Value ret(Json::arrayValue);
ret.append("lll");
#if SOLIDITY
ret.append("solidity");
#ifndef _MSC_VER
#endif
#if SERPENT
ret.append("serpent");
#endif
return ret;
@ -642,7 +646,7 @@ string WebThreeStubServerBase::eth_compileSerpent(string const& _code)
{
// TODO throw here jsonrpc errors
string res;
#ifndef _MSC_VER
#if SERPENT
try
{
res = toJS(dev::asBytes(::compile(_code)));
@ -663,6 +667,7 @@ string WebThreeStubServerBase::eth_compileSolidity(string const& _code)
{
// TOOD throw here jsonrpc errors
string res;
#if SOLIDITY
dev::solidity::CompilerStack compiler;
try
{
@ -678,6 +683,7 @@ string WebThreeStubServerBase::eth_compileSolidity(string const& _code)
{
cwarn << "Uncought solidity compilation exception";
}
#endif
return res;
}

Loading…
Cancel
Save