From 858d725658414505f28602024d7ab2312d0f13d2 Mon Sep 17 00:00:00 2001 From: arkpar Date: Thu, 16 Apr 2015 13:25:30 +0200 Subject: [PATCH] resolved windows issues --- mix/CodeHighlighter.cpp | 2 +- mix/ContractCallDataEncoder.cpp | 2 +- mix/FileIo.cpp | 3 ++- mix/MixClient.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mix/CodeHighlighter.cpp b/mix/CodeHighlighter.cpp index 5a7b1f4d5..a3908a1b5 100644 --- a/mix/CodeHighlighter.cpp +++ b/mix/CodeHighlighter.cpp @@ -109,7 +109,7 @@ void CodeHighlighter::processError(dev::Exception const& _exception) void CodeHighlighter::processComments(std::string const& _source) { unsigned i = 0; - unsigned size = _source.size(); + size_t size = _source.size(); if (size == 0) return; while (i < size - 1) diff --git a/mix/ContractCallDataEncoder.cpp b/mix/ContractCallDataEncoder.cpp index e1f02f631..c561c0017 100644 --- a/mix/ContractCallDataEncoder.cpp +++ b/mix/ContractCallDataEncoder.cpp @@ -127,7 +127,7 @@ unsigned ContractCallDataEncoder::encodeSingleItem(QString const& _data, Solidit } } - unsigned dataSize = _type.dynamicSize ? result.size() : alignSize; + size_t dataSize = _type.dynamicSize ? result.size() : alignSize; if (result.size() % alignSize != 0) result.resize((result.size() & ~(alignSize - 1)) + alignSize); _dest.insert(_dest.end(), result.begin(), result.end()); diff --git a/mix/FileIo.cpp b/mix/FileIo.cpp index 6d3d9c1c3..0991aa63d 100644 --- a/mix/FileIo.cpp +++ b/mix/FileIo.cpp @@ -102,6 +102,7 @@ void FileIo::writeFile(QString const& _url, QString const& _data) } else error(tr("Error writing file %1").arg(_url)); + file.close(); m_watcher->addPath(path); } @@ -184,7 +185,7 @@ QStringList FileIo::makePackage(QString const& _deploymentFolder) QUrl url(_deploymentFolder + "package.dapp"); QFile compressed(url.path()); - QByteArray qFileBytes((char*)dapp.data(), dapp.size()); + QByteArray qFileBytes((char*)dapp.data(), static_cast(dapp.size())); if (compressed.open(QIODevice::WriteOnly)) { compressed.write(qFileBytes); diff --git a/mix/MixClient.cpp b/mix/MixClient.cpp index adbf89737..965a4c5ac 100644 --- a/mix/MixClient.cpp +++ b/mix/MixClient.cpp @@ -40,7 +40,7 @@ namespace mix { Secret const c_defaultUserAccountSecret = Secret("cb73d9408c4720e230387d956eb0f829d8a4dd2c1055f96257167e14e7169074"); -u256 const c_mixGenesisDifficulty = c_minimumDifficulty; //TODO: make it lower for Mix somehow +u256 const c_mixGenesisDifficulty = 131072; //TODO: make it lower for Mix somehow bytes MixBlockChain::createGenesisBlock(h256 _stateRoot) {