Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix imported CAPI function declarations #1041

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix imported CAPI function declarations #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/eosiolib/contracts/eosio/action.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ namespace eosio {
bool is_account( uint64_t name );

__attribute__((eosio_wasm_import))
void send_inline(char *serialized_action, size_t size);
void send_inline(char* serialized_action, size_t size);

__attribute__((eosio_wasm_import))
void send_context_free_inline(char *serialized_action, size_t size);
void send_context_free_inline(char* serialized_action, size_t size);

__attribute__((eosio_wasm_import))
uint64_t publication_time();
Expand Down
4 changes: 2 additions & 2 deletions libraries/eosiolib/contracts/eosio/privileged.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ namespace eosio {
int64_t set_proposed_producers( char*, uint32_t );

__attribute__((eosio_wasm_import))
void preactivate_feature( const capi_checksum256* feature_digest );
void preactivate_feature( const struct capi_checksum256* feature_digest );

__attribute__((eosio_wasm_import))
int64_t set_proposed_producers_ex( uint64_t producer_data_format, char *producer_data, uint32_t producer_data_size );
int64_t set_proposed_producers_ex( uint64_t producer_data_format, char* producer_data, uint32_t producer_data_size );
}
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/eosiolib/contracts/eosio/system.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace eosio {
};

__attribute__((eosio_wasm_import))
bool is_feature_activated( const capi_checksum256* feature_digest );
bool is_feature_activated( const struct capi_checksum256* feature_digest);

__attribute__((eosio_wasm_import))
uint64_t get_sender();
Expand Down
10 changes: 5 additions & 5 deletions libraries/eosiolib/contracts/eosio/transaction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ namespace eosio {
namespace internal_use_do_not_use {
extern "C" {
__attribute__((eosio_wasm_import))
void send_deferred(const uint128_t&, uint64_t, const char*, size_t, uint32_t);
void send_deferred(const uint128_t*, uint64_t, const char*, size_t, uint32_t);

__attribute__((eosio_wasm_import))
int cancel_deferred(const uint128_t&);
int cancel_deferred(const uint128_t*);

__attribute__((eosio_wasm_import))
size_t read_transaction(char*, size_t);
Expand Down Expand Up @@ -124,7 +124,7 @@ namespace eosio {
*/
void send(const uint128_t& sender_id, name payer, bool replace_existing = false) const {
auto serialize = pack(*this);
internal_use_do_not_use::send_deferred(sender_id, payer.value, serialize.data(), serialize.size(), replace_existing);
internal_use_do_not_use::send_deferred(&sender_id, payer.value, serialize.data(), serialize.size(), replace_existing);
}

std::vector<action> context_free_actions;
Expand Down Expand Up @@ -173,7 +173,7 @@ namespace eosio {
* @param replace - If true, will replace an existing transaction.
*/
inline void send_deferred(const uint128_t& sender_id, name payer, const char* serialized_transaction, size_t size, bool replace = false) {
internal_use_do_not_use::send_deferred(sender_id, payer.value, serialized_transaction, size, replace);
internal_use_do_not_use::send_deferred(&sender_id, payer.value, serialized_transaction, size, replace);
}
/**
* Retrieve the indicated action from the active transaction.
Expand Down Expand Up @@ -224,7 +224,7 @@ namespace eosio {
* @endcode
*/
inline int cancel_deferred(const uint128_t& sender_id) {
return internal_use_do_not_use::cancel_deferred(sender_id);
return internal_use_do_not_use::cancel_deferred(&sender_id);
}

/**
Expand Down