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

PREP_DIR instead of hard-coded "Player-Data/" when suitable. #693

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

PREP_DIR instead of hard-coded "Player-Data/" when suitable. #693

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 Processor/OnlineOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ OnlineOptions::OnlineOptions() : playerno(-1)
direct = false;
bucket_size = 4;
security_parameter = DEFAULT_SECURITY;
cmd_private_input_file = "Player-Data/Input";
cmd_private_input_file = PREP_DIR "Input";
cmd_private_output_file = "";
file_prep_per_thread = false;
trunc_error = DEFAULT_SECURITY;
Expand Down Expand Up @@ -62,7 +62,7 @@ OnlineOptions::OnlineOptions(ez::ezOptionParser& opt, int argc,
0, // Required?
1, // Number of args expected.
0, // Delimiter if expecting multiple args.
"Prefix for input file path (default: Player-Data/Private-Input). "
"Prefix for input file path (default: " PREP_DIR "Private-Input). "
"Input will be read from {prefix}-P{id}-{thread_id}.", // Help description.
"-IF", // Flag token.
"--input-file" // Flag token.
Expand Down
2 changes: 1 addition & 1 deletion Processor/ProcessorBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void ProcessorBase::open_input_file(int my_num, int thread_num,
{
string tmp = prefix;
if (prefix.empty())
tmp = "Player-Data/Input";
tmp = PREP_DIR "Input";

open_input_file(get_parameterized_filename(my_num, thread_num, tmp));
}
Expand Down
2 changes: 1 addition & 1 deletion Utils/gen_input_fp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ int main(int argc, const char** argv) {
for (int i = 0; i < n; i++)
gfp(0).output(*out, false);
cerr << "Output written to " << output_name
<< ", copy to Player-Data/Private-Input-<playerno>" << endl;
<< ", copy to " PREP_DIR "Private-Input-<playerno>" << endl;

// Clean up file streams.
if(!use_stdin) {
Expand Down