arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use OS X 10.1 image for Travis testing

pull/762/head
Jeffrey Walton 2018-12-08 08:08:08 -05:00
parent 8c4f38b27d
commit 5124ff7b20
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -8,7 +8,7 @@ dist: xenial
sudo: required sudo: required
# OS X only supports one image. Use the latest. # OS X only supports one image. Use the latest.
osx_image: xcode9.4 osx_image: xcode10.1
git: git:
depth: 3 depth: 3

2
bench.h
View File

@ -37,7 +37,7 @@ extern const byte defaultKey[];
extern time_t g_testBegin; extern time_t g_testBegin;
extern time_t g_testEnd; extern time_t g_testEnd;
// Command handler // Benchmark command handler
void BenchmarkWithCommand(int argc, const char* const argv[]); void BenchmarkWithCommand(int argc, const char* const argv[]);
// Top level, prints preamble and postamble // Top level, prints preamble and postamble
void Benchmark(Test::TestClass suites, double t, double hertz); void Benchmark(Test::TestClass suites, double t, double hertz);

4
validate.h
View File

@ -223,7 +223,7 @@ inline T StringToValue(const std::string& str)
iss >> std::noskipws >> value; iss >> std::noskipws >> value;
// Use fail(), not bad() // Use fail(), not bad()
if (iss.fail() || !iss.eof()) if (iss.fail())
throw InvalidArgument(str + "' is not a value"); throw InvalidArgument(str + "' is not a value");
if (NON_NEGATIVE && value < 0) if (NON_NEGATIVE && value < 0)
@ -254,6 +254,8 @@ inline std::string AddSeparator(std::string str)
return str; return str;
} }
// Ideally we would cache the directory and just add the prefix
// to subsequent calls, but ... Static Initialization Order Fiasco
inline std::string DataDir(const std::string& filename) inline std::string DataDir(const std::string& filename)
{ {
std::string name; std::string name;