diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
| commit | 69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch) | |
| tree | 51c8c1f971d39d652ec38ed76070539bb33e85c7 /base/sys_info_posix.cc | |
| parent | e3748a79b523a8d365d4a33ef986eebb4186fa78 (diff) | |
| download | chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2 | |
Revert "Rewrite std::string("") to std::string(), Linux edition."
This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.
Revert "Fix build after r193020."
This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.
Revert "Really fix build after r193020."
This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_posix.cc')
| -rw-r--r-- | base/sys_info_posix.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc index 57b7af6..854f123 100644 --- a/base/sys_info_posix.cc +++ b/base/sys_info_posix.cc @@ -55,7 +55,7 @@ std::string SysInfo::OperatingSystemName() { struct utsname info; if (uname(&info) < 0) { NOTREACHED(); - return std::string(); + return ""; } return std::string(info.sysname); } @@ -67,7 +67,7 @@ std::string SysInfo::OperatingSystemVersion() { struct utsname info; if (uname(&info) < 0) { NOTREACHED(); - return std::string(); + return ""; } return std::string(info.release); } @@ -78,7 +78,7 @@ std::string SysInfo::OperatingSystemArchitecture() { struct utsname info; if (uname(&info) < 0) { NOTREACHED(); - return std::string(); + return ""; } std::string arch(info.machine); if (arch == "i386" || arch == "i486" || arch == "i586" || arch == "i686") { |