Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Win32 compile fixes (missing includes, workaround for bugs in c++ parser)

Browse source
This commit is contained in:
Eric Frias 2015-07-27 12:09:34 -04:00
parent bd4ab4f168
commit 6d2b1a3648
5 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/app/api.cpp
View file

@ -15,6 +15,8 @@
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <cctype>
#include <graphene/app/api.hpp>
#include <graphene/app/api_access.hpp>
#include <graphene/app/application.hpp>

8
libraries/chain/protocol/transaction.cpp
View file

@ -208,18 +208,24 @@ void verify_authority( const vector<operation>& ops, const flat_set<public_key_t
s.approved_by.insert( id );
for( const auto& auth : other )
{
GRAPHENE_ASSERT( s.check_authority(&auth), tx_missing_other_auth, "Missing Authority", ("auth",auth)("sigs",sigs) );
}
// fetch all of the top level authorities
for( auto id : required_active )
{
GRAPHENE_ASSERT( s.check_authority(id) ||
s.check_authority(get_owner(id)),
tx_missing_active_auth, "Missing Active Authority ${id}", ("id",id)("auth",*get_active(id))("owner",*get_owner(id)) );
}
for( auto id : required_owner )
{
GRAPHENE_ASSERT( owner_approvals.find(id) != owner_approvals.end() ||
s.check_authority(get_owner(id)),
tx_missing_other_auth, "Missing Owner Authority ${id}", ("id",id)("auth",*get_owner(id)) );
}
FC_ASSERT( !s.remove_unused_signatures(), "Unnecessary signatures detected" );
} FC_CAPTURE_AND_RETHROW( (ops)(sigs) ) }
@ -230,7 +236,9 @@ flat_set<public_key_type> signed_transaction::get_signature_keys()const
auto d = digest();
flat_set<public_key_type> result;
for( const auto& sig : signatures )
{
FC_ASSERT( result.insert( fc::ecc::public_key(sig,d) ).second, "Duplicate Signature detected" );
}
return result;
} FC_CAPTURE_AND_RETHROW() }

2
libraries/db/include/graphene/db/index.hpp
View file

@ -49,7 +49,7 @@ namespace graphene { namespace db {
* @brief abstract base class for accessing objects indexed in various ways.
*
* All indexes assume that there exists an object ID space that will grow
* for ever in a seqential manner. These IDs are used to identify the
* forever in a seqential manner. These IDs are used to identify the
* index, type, and instance of the object.
*
* Items in an index can only be modified via a call to modify and

2
libraries/fc

@ -1 +1 @@
Subproject commit e9eeb3300c59bca19b8c79c14ed85226d2262c63
Subproject commit a31f0f503df4d70ebb5960803c7092dc170bee92

4
libraries/wallet/wallet.cpp
View file

@ -2983,7 +2983,9 @@ blind_confirmation wallet_api::blind_transfer_help( string from_key_or_label,
if( broadcast )
{
for( const auto& out : confirm.outputs )
{
try { receive_blind_transfer( out.confirmation_receipt, from_key_or_label, "" ); } catch ( ... ){}
}
}
return confirm;
@ -3070,7 +3072,9 @@ blind_confirmation wallet_api::transfer_to_blind( string from_account_id_or_name
if( broadcast )
{
for( const auto& out : confirm.outputs )
{
try { receive_blind_transfer( out.confirmation_receipt, "@"+from_account.name, "from @"+from_account.name ); } catch ( ... ){}
}
}
return confirm;