Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Api cleanup + SetManifest for Merger #118

Merged
merged 10 commits into from
Aug 23, 2016
Merged

Api cleanup + SetManifest for Merger #118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9bd54ba
remove const char* in favor of std::string
Aug 23, 2016
2cb5d6c
replace more const char* with std::string
Aug 23, 2016
fa942d4
simplify code (also based on review comments)
Jul 14, 2016
682d35d
set TPIE temp path according to compiler parameter
Jul 15, 2016
c8a6ac6
run autowrap
Aug 23, 2016
a644d72
add API to merger for setting a manifest
Aug 23, 2016
da3377d
simplify internals, removing more const char* leftover
Aug 23, 2016
bb528fa
constify interface
Aug 23, 2016
8d9fc19
fix setting the tmp path for TPIE twice.
Aug 23, 2016
2d36257
const not required here
Aug 23, 2016
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
3 changes: 1 addition & 2 deletions keyvi/src/cpp/dictionary/dictionary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ final {
: fsa_(f) {
}

// temporary implementation
fsa::automata_t GetFsa() const {
const fsa::automata_t GetFsa() const {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first const is not needed, anyway the return value is a temporary object.

return fsa_;
}

Expand Down
2 changes: 1 addition & 1 deletion keyvi/src/cpp/dictionary/fsa/automata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ final {
};

// shared pointer
typedef std::shared_ptr<Automata> automata_t;
typedef std::shared_ptr<const Automata> automata_t;

} /* namespace fsa */
} /* namespace dictionary */
Expand Down