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

Merge branch 'master' of https://github.com/AxioDL/amuse

This commit is contained in:
Jack Andersen 2016-06-19 17:36:32 -10:00
parent ee29fb4b1e ad23f9d0c4
commit 7666b51c50
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ContainerRegistry.cpp
View File

@ -35,7 +35,7 @@ static void *memmem(const void *haystack, size_t hlen, const void *needle, size_
return NULL; return NULL;
} }
amuse::SystemString StrToSys(const std::string& str) static amuse::SystemString StrToSys(const std::string& str)
{ {
std::wstring ret; std::wstring ret;
int len = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.size(), nullptr, 0); int len = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.size(), nullptr, 0);
@ -45,7 +45,7 @@ amuse::SystemString StrToSys(const std::string& str)
} }
#else #else
amuse::SystemString StrToSys(const std::string& str) static amuse::SystemString StrToSys(const std::string& str)
{ {
return str; return str;
} }