Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
JoelKatz
2012-08-08 13:56:52 -07:00
3 changed files with 5 additions and 9 deletions

View File

@@ -146,6 +146,7 @@
<ClCompile Include="src\SHAMapDiff.cpp" />
<ClCompile Include="src\SHAMapNodes.cpp" />
<ClCompile Include="src\SHAMapSync.cpp" />
<ClCompile Include="src\SNTPClient.cpp" />
<ClCompile Include="src\Suppression.cpp" />
<ClCompile Include="src\Transaction.cpp" />
<ClCompile Include="src\TransactionEngine.cpp" />
@@ -248,17 +249,13 @@
<None Include="html\newcoin.html">
<SubType>Designer</SubType>
</None>
<None Include="Issues" />
<None Include="Makefile" />
<None Include="newcoind.cfg" />
<None Include="notes.txt" />
<CustomBuild Include="src\newcoin.proto">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\protoc-2.4.1-win32\protoc -I=..\newcoin\src --cpp_out=..\newcoin\obj\src ..\newcoin\src\newcoin.proto</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\src\newcoin.pb.h</Outputs>
</CustomBuild>
<None Include="SConstruct" />
<None Include="todo.txt" />
<None Include="validators.txt" />
<None Include="wallet.xml" />
</ItemGroup>

View File

@@ -273,6 +273,9 @@
<ClCompile Include="src\TransactionMeta.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\SNTPClient.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="KnownNodeList.h">
@@ -506,16 +509,12 @@
</ItemGroup>
<ItemGroup>
<None Include="wallet.xml" />
<None Include="notes.txt" />
<None Include="html\newcoin.html">
<Filter>html</Filter>
</None>
<None Include="todo.txt" />
<None Include="Makefile" />
<None Include="SConstruct" />
<None Include="newcoind.cfg" />
<None Include="validators.txt" />
<None Include="Issues" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="src\newcoin.proto" />

View File

@@ -129,7 +129,7 @@ void LedgerAcquire::done()
if (mLedger)
theApp->getMasterLedger().storeLedger(mLedger);
for (int i = 0; i < triggers.size(); ++i)
for (unsigned int i = 0; i < triggers.size(); ++i)
triggers[i](shared_from_this());
}