libAthena/athena
2
0
Fork 0
mirror of https://github.com/libAthena/athena.git synced 2025-12-09 13:38:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fix build

Browse Source
This commit is contained in:
Phillip Stephens
2014-08-16 18:48:27 -07:00
parent 47054ea881
commit f3e9fb4f70
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Athena/Utility.hpp
View File

@@ -40,7 +40,11 @@ double swapDouble(double val);
bool isSystemBigEndian();
<<<<<<< Updated upstream
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::string join(const std::vector<std::string>& elems, const std::string& delims);