Skip to content

Commit

Permalink
added __pycache__/ to git ignore.
Browse files Browse the repository at this point in the history
  • Loading branch information
hariharan-devarajan committed Jan 13, 2021
1 parent 2e5a55c commit 226fab9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/api/traits.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Trait::Trait(TraitID id, TraitIdArray conflict_traits, TraitType type)

FileMappingTrait::FileMappingTrait(
std::string &filename, std::unordered_map<std::string, u64> &offset_map,
bool flush, TraitCallback flush_cb, bool load, TraitCallback load_cb)
TraitCallback flush_cb, TraitCallback load_cb)
: Trait(FILE_TRAIT, TraitIdArray(), TraitType::FILE_MAPPING),
flush_cb(flush_cb),
load_cb(load_cb),
Expand Down
4 changes: 2 additions & 2 deletions src/api/traits.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ struct FileMappingTrait : public Trait {
std::string filename;
std::unordered_map<std::string, u64> offset_map;
FileMappingTrait(std::string &filename,
std::unordered_map<std::string, u64> &offset_map, bool flush,
TraitCallback flush_cb, bool load, TraitCallback load_cb);
std::unordered_map<std::string, u64> &offset_map,
TraitCallback flush_cb, TraitCallback load_cb);
void onAttach(TraitInput &blob, Trait *trait);
void onDetach(TraitInput &blob, Trait *trait);
void onLink(TraitInput &blob, Trait *trait);
Expand Down
4 changes: 2 additions & 2 deletions test/trait_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ TEST_CASE("CustomTrait",
file_vbucket.Link(blob_name, args.filename, ctx);
offset_map.emplace(blob_name, std::stol(blob_name) * info.FILE_PAGE);
}
auto trait = hermes::api::FileMappingTrait(fullpath_str, offset_map, false,
NULL, false, NULL);
auto trait =
hermes::api::FileMappingTrait(fullpath_str, offset_map, NULL, NULL);
file_vbucket.Attach(&trait, ctx);
file_vbucket.Delete(ctx);
file_bucket.Destroy(ctx);
Expand Down

0 comments on commit 226fab9

Please sign in to comment.