diff --git a/newcoin.vcxproj b/newcoin.vcxproj index da9d0d0139..6cb762b945 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -48,7 +48,7 @@ NotUsing Level3 Disabled - BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) ..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src\ diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index b0a7536c0a..22c4b71e84 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -557,7 +557,7 @@ Json::Value RPCServer::doLedger(Json::Value& params) int paramCount = getParamCount(params); - if (paramCount == 0); + if (paramCount == 0) { Json::Value ret(Json::objectValue), current(Json::objectValue), closed(Json::objectValue); theApp->getMasterLedger().getCurrentLedger()->addJson(current); diff --git a/src/main.cpp b/src/main.cpp index 489e0b733e..95181c49dd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -70,10 +70,10 @@ int main(int argc, char* argv[]) ("help,h", "Display this message.") ("rpc", "Perform rpc command (default).") ("test,t", "Perform unit tests.") - ("parameters", po::value< vector >(), "Specify comma seperated parameters.") + ("parameters", po::value< vector >(), "Specify comma separated parameters.") ; - // Interpert positional arguments as --parameters. + // Interpret positional arguments as --parameters. po::positional_options_description p; p.add("parameters", -1); @@ -124,7 +124,7 @@ int main(int argc, char* argv[]) pvCmd.push_back(const_cast(param.c_str())); } -// iResult = unit_test_main(init_unit_test, iCmd, &pvCmd[0]); + iResult = unit_test_main(init_unit_test, iCmd, &pvCmd[0]); } else if (!vm.count("parameters")) {