Merge pull request #1966
7ff19f1e
Easylogging: remove invalid static in function member definition (MoroccanMalinois)
This commit is contained in:
commit
c1691ed58e
|
@ -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");
|
||||||
|
|
Loading…
Reference in New Issue