From eb185f2ce8c73db6a258ef3eb6912498000904be Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 25 Mar 2013 16:37:24 -0700 Subject: [PATCH] remove command options methods from SharedUtil that crash Jenkins --- shared/src/SharedUtil.cpp | 30 ------------------------------ shared/src/SharedUtil.h | 3 --- 2 files changed, 33 deletions(-) diff --git a/shared/src/SharedUtil.cpp b/shared/src/SharedUtil.cpp index 3e9e75e2bb..cb55232a89 100644 --- a/shared/src/SharedUtil.cpp +++ b/shared/src/SharedUtil.cpp @@ -79,36 +79,6 @@ void switchToResourcesIfRequired() { #endif } -////////////////////////////////////////////////////////////////////////////////////////// -// Function: getCmdOption() -// Description: Handy little function to tell you if a command line flag and option was -// included while launching the application, and to get the option value -// immediately following the flag. For example if you ran: -// ./app -i filename.txt -// then you're using the "-i" flag to set the input file name. -// Usage: char * inputFilename = getCmdOption(argv, argv + argc, "-i"); -// Complaints: Brad :) -char* getCmdOption(char ** begin, char ** end, const std::string & option) -{ - char ** itr = std::find(begin, end, option); - if (itr != end && ++itr != end) - { - return *itr; - } - return 0; -} - -////////////////////////////////////////////////////////////////////////////////////////// -// Function: getCmdOption() -// Description: Handy little function to tell you if a command line option flag was -// included while launching the application. Returns bool true/false -// Usage: bool wantDump = cmdOptionExists(argv, argv+argc, "-d"); -// Complaints: Brad :) -bool cmdOptionExists(char** begin, char** end, const std::string& option) -{ - return std::find(begin, end, option) != end; -} - ////////////////////////////////////////////////////////////////////////////////////////// // Function: pointToVoxel() // Description: Given a universal point with location x,y,z this will return the voxel diff --git a/shared/src/SharedUtil.h b/shared/src/SharedUtil.h index 1ba5ff8280..79790b5ed3 100644 --- a/shared/src/SharedUtil.h +++ b/shared/src/SharedUtil.h @@ -33,9 +33,6 @@ bool oneAtBit(unsigned char byte, int bitIndex); void switchToResourcesIfRequired(); -char* getCmdOption(char ** begin, char ** end, const std::string& option); -bool cmdOptionExists(char** begin, char** end, const std::string& option); - unsigned char* pointToVoxel(float x, float y, float z, float s, unsigned char r, unsigned char g, unsigned char b ); #endif /* defined(__hifi__SharedUtil__) */