Skip to content

Minor cleanups #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Local files generated by IDEs
.vs/*
.vscode/*
~AutoRecover.*
*.sln
*.vcxproj*
scripts/__pycache__/*
src/goto-analyzer/taint_driver_scripts/.idea/*
/*.config
/*.creator
/*.creator.user
/*.files
/*.includes

# compilation files
*.lo
Expand Down
2 changes: 2 additions & 0 deletions src/util/irep_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ inline std::size_t basic_hash_finalize(
return h1;
}

// Boost uses the symbol hash_combine, if you're getting problems here then
// you've probably included a Boost header after this one
#define hash_combine(h1, h2) \
basic_hash_combine<sizeof(std::size_t)*8>(h1, h2)
#define hash_finalize(h1, len) \
Expand Down
4 changes: 2 additions & 2 deletions src/util/json.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ class json_arrayt:public jsont
jsont &push_back(const jsont &json)
{
array.push_back(json);
return static_cast<jsont &>(array.back());
return array.back();
}

jsont &push_back()
{
array.push_back(jsont());
return static_cast<jsont &>(array.back());
return array.back();
}
};

Expand Down