nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1966

Browse Source 
7ff19f1e Easylogging: remove invalid static in function member definition (MoroccanMalinois)
This commit is contained in:
Riccardo Spagni 2017-04-24 10:45:22 +02:00
commit c1691ed58e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/easylogging++/easylogging++.cc vendored
View File

@ -990,7 +990,7 @@ std::string OS::getProperty(const char* prop) {
return ret == 0 ? std::string() : std::string(propVal); return ret == 0 ? std::string() : std::string(propVal);
} }
static std::string OS::getDeviceName(void) { std::string OS::getDeviceName(void) {
std::stringstream ss; std::stringstream ss;
std::string manufacturer = getProperty("ro.product.manufacturer"); std::string manufacturer = getProperty("ro.product.manufacturer");
std::string model = getProperty("ro.product.model"); std::string model = getProperty("ro.product.model");