Permalink
Browse files

Fixed OSX build break.

  • Loading branch information...
MikeHopcroft committed Sep 25, 2016
1 parent e471a98 commit 8f49fe39328030748186df75d744296d40019a42
@@ -44,7 +44,7 @@ namespace BitFunnel
int BitFunnelTool::Main(std::istream& input,
std::ostream& output,
int argc,
- char** argv)
+ char const *argv[])
{
int returnCode = 1;
@@ -67,7 +67,7 @@ namespace BitFunnel
executable->Main(input,
output,
static_cast<int>(args.size()),
- const_cast<char**>(args.data()));
+ args.data());
returnCode = 0;
}
else
@@ -108,7 +108,7 @@ namespace BitFunnel
std::vector<char const *> BitFunnelTool::FilterArgs(
int argc,
- char *argv[],
+ char const *argv[],
char const * name) const
{
std::vector<char const *> args;
@@ -42,7 +42,7 @@ namespace BitFunnel
virtual int Main(std::istream& input,
std::ostream& output,
int argc,
- char *argv[]) override;
+ char const *argv[]) override;
private:
// Constructs the IExecutable associated with the specified subcommand.
@@ -57,7 +57,7 @@ namespace BitFunnel
// name.
std::vector<char const *> FilterArgs(
int argc,
- char *argv[],
+ char const *argv[],
char const * name) const;
// Prints the top-level usage message for the BitFunnel command.
@@ -35,6 +35,6 @@ namespace BitFunnel
virtual int Main(std::istream& input,
std::ostream& output,
int argc,
- char *argv[]) = 0;
+ char const *argv[]) = 0;
};
}
@@ -41,7 +41,7 @@ namespace BitFunnel
int REPL::Main(std::istream& input,
std::ostream& output,
int argc,
- char** argv)
+ char const *argv[])
{
CmdLine::CmdLineParser parser(
"StatisticsBuilder",
@@ -40,7 +40,7 @@ namespace BitFunnel
virtual int Main(std::istream& input,
std::ostream& output,
int argc,
- char *argv[]) override;
+ char const *argv[]) override;
private:
void Advice(std::ostream& output) const;
@@ -50,7 +50,7 @@ namespace BitFunnel
int StatisticsBuilder::Main(std::istream& /*input*/,
std::ostream& output,
int argc,
- char** argv)
+ char const *argv[])
{
CmdLine::CmdLineParser parser(
"StatisticsBuilder",
@@ -41,7 +41,7 @@ namespace BitFunnel
virtual int Main(std::istream& input,
std::ostream& output,
int argc,
- char *argv[]) override;
+ char const *argv[]) override;
private:
std::vector<std::string> ReadLines(char const * fileName) const;
@@ -50,7 +50,7 @@ namespace BitFunnel
int TermTableBuilderTool::Main(std::istream& /*input*/,
std::ostream& output,
int argc,
- char** argv)
+ char const *argv[])
{
CmdLine::CmdLineParser parser(
"TermTableBuilderTool",
@@ -39,7 +39,7 @@ namespace BitFunnel
virtual int Main(std::istream& input,
std::ostream& output,
int argc,
- char *argv[]) override;
+ char const *argv[]) override;
private:
void BuildTermTable(
@@ -92,7 +92,7 @@ namespace BitFunnel
{
std::cout << "Gathering corpus statistics." << std::endl;
- std::vector<char *> argv = {
+ std::vector<char const *> argv = {
"BitFunnel",
"statistics",
"manifest.txt",
@@ -115,7 +115,7 @@ namespace BitFunnel
{
std::cout << "Building the TermTable." << std::endl;
- std::vector<char *> argv = {
+ std::vector<char const *> argv = {
"BitFunnel",
"termtable",
"config"
@@ -140,7 +140,7 @@ namespace BitFunnel
// Use the tool to run the REPL.
//
{
- std::vector<char *> argv = {
+ std::vector<char const *> argv = {
"BitFunnel",
"repl",
"config"
@@ -32,5 +32,5 @@ int main(int argc, char** argv)
{
auto fileSystem = BitFunnel::Factories::CreateFileSystem();
BitFunnel::BitFunnelTool tool(*fileSystem);
- return tool.Main(std::cin, std::cout, argc, argv);
+ return tool.Main(std::cin, std::cout, argc, const_cast<char const **>(argv));
}
@@ -79,7 +79,7 @@ namespace BitFunnel
// Use the tool to run the statistics builder.
//
{
- std::vector<char *> argv = {
+ std::vector<char const *> argv = {
"BitFunnel",
"statistics",
"manifest.txt",
@@ -97,7 +97,7 @@ namespace BitFunnel
// Use the tool to run the TermTable builder.
//
{
- std::vector<char *> argv = {
+ std::vector<char const *> argv = {
"BitFunnel",
"termtable",
"config"
@@ -114,7 +114,7 @@ namespace BitFunnel
// Use the tool to run the REPL.
//
{
- std::vector<char *> argv = {
+ std::vector<char const *> argv = {
"BitFunnel",
"repl",
"config"

0 comments on commit 8f49fe3

Please sign in to comment.