libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix merge

This commit is contained in:
Phillip Stephens 2014-09-05 14:59:27 -07:00
parent f3e9fb4f70
commit 814eda3d4c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Athena/Utility.hpp
View File

@ -39,13 +39,7 @@ float swapFloat(float val);
double swapDouble(double val); double swapDouble(double val);
bool isSystemBigEndian(); bool isSystemBigEndian();
<<<<<<< Updated upstream
void fillRandom(atUint8 * rndArea, atUint64 count); void fillRandom(atUint8 * rndArea, atUint64 count);
=======
void fillRandom(atUint8 * rndArea, atUint8 count);
>>>>>>> Stashed changes
std::vector<std::string> split(const std::string &s, char delim); std::vector<std::string> split(const std::string &s, char delim);
std::string join(const std::vector<std::string>& elems, const std::string& delims); std::string join(const std::vector<std::string>& elems, const std::string& delims);
void tolower(std::string& str); void tolower(std::string& str);