diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-04-24 10:45:22 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-04-24 10:45:22 +0200 |
| commit | c1691ed58e44f37174d9e729f9b6580a465fea36 (patch) | |
| tree | 86d1dab10740c03a778d112ae031a672e450fafd /external | |
| parent | 042924b3551e1366b8d2234a8407d72701ec2ec0 (diff) | |
| parent | 7ff19f1ec49ac18c45fc6a524d2c15379ac59b76 (diff) | |
| download | monzero-core-c1691ed58e44f37174d9e729f9b6580a465fea36.tar.gz monzero-core-c1691ed58e44f37174d9e729f9b6580a465fea36.tar.xz monzero-core-c1691ed58e44f37174d9e729f9b6580a465fea36.zip | |
Merge pull request #1966
7ff19f1e Easylogging: remove invalid static in function member definition (MoroccanMalinois)
Diffstat (limited to 'external')
| -rw-r--r-- | external/easylogging++/easylogging++.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/easylogging++/easylogging++.cc b/external/easylogging++/easylogging++.cc index 3e8463fdf..4fbb94b25 100644 --- a/external/easylogging++/easylogging++.cc +++ b/external/easylogging++/easylogging++.cc @@ -990,7 +990,7 @@ std::string OS::getProperty(const char* prop) { return ret == 0 ? std::string() : std::string(propVal); } -static std::string OS::getDeviceName(void) { +std::string OS::getDeviceName(void) { std::stringstream ss; std::string manufacturer = getProperty("ro.product.manufacturer"); std::string model = getProperty("ro.product.model"); |