Browse Source

Windows build fixes.

cl-refactor
Gav Wood 10 years ago
parent
commit
ae74058320
  1. 2
      alethzero/Main.ui
  2. 1
      alethzero/MainWin.cpp
  3. 4
      libdevcore/Common.h
  4. 2
      libethereum/BlockChain.cpp

2
alethzero/Main.ui

@ -552,7 +552,7 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<widget class="QDockWidget" name="dockWidget_contracts"> <widget class="QDockWidget" name="dockWidget_accounts">
<property name="features"> <property name="features">
<set>QDockWidget::DockWidgetFeatureMask</set> <set>QDockWidget::DockWidgetFeatureMask</set>
</property> </property>

1
alethzero/MainWin.cpp

@ -145,7 +145,6 @@ Main::Main(QWidget *parent) :
#if !ETH_FATDB #if !ETH_FATDB
delete ui->dockWidget_accounts; delete ui->dockWidget_accounts;
delete ui->dockWidget_contracts;
#endif #endif
#if ETH_DEBUG #if ETH_DEBUG

4
libdevcore/Common.h

@ -182,7 +182,11 @@ private:
#define DEV_TIMED(S) for (::std::pair<::dev::TimerHelper, bool> __eth_t(#S, true); __eth_t.second; __eth_t.second = false) #define DEV_TIMED(S) for (::std::pair<::dev::TimerHelper, bool> __eth_t(#S, true); __eth_t.second; __eth_t.second = false)
#define DEV_TIMED_SCOPE(S) ::dev::TimerHelper __eth_t(S) #define DEV_TIMED_SCOPE(S) ::dev::TimerHelper __eth_t(S)
#if WIN32
#define DEV_TIMED_FUNCTION DEV_TIMED_SCOPE(__FUNCSIG__)
#else
#define DEV_TIMED_FUNCTION DEV_TIMED_SCOPE(__PRETTY_FUNCTION__) #define DEV_TIMED_FUNCTION DEV_TIMED_SCOPE(__PRETTY_FUNCTION__)
#endif
enum class WithExisting: int enum class WithExisting: int
{ {

2
libethereum/BlockChain.cpp

@ -47,7 +47,7 @@ using namespace dev::eth;
namespace js = json_spirit; namespace js = json_spirit;
#define ETH_CATCH 1 #define ETH_CATCH 1
#define ETH_TIMED_IMPORTS 1 #define ETH_TIMED_IMPORTS 0
#ifdef _WIN32 #ifdef _WIN32
const char* BlockChainDebug::name() { return EthBlue "8" EthWhite " <>"; } const char* BlockChainDebug::name() { return EthBlue "8" EthWhite " <>"; }

Loading…
Cancel
Save