summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-08-18 20:26:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-19 03:27:46 +0000
commit37be69cfdb84f4fdabcb779f443d18bbc04f1ffb (patch)
treecb8baf96f447aa5cf415ae19f9f92aa9f43d2d11 /base
parentec748bc5560f56d838178b07313e59bd4136f7ee (diff)
downloadchromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.zip
chromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.tar.gz
chromium_src-37be69cfdb84f4fdabcb779f443d18bbc04f1ffb.tar.bz2
Revert of base: Remove using:: declaration from version.h header. (patchset #24 id:450001 of https://codereview.chromium.org/1281313003/ )
Reason for revert: Broke all official bots, e.g. http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/1926/steps/compile/logs/stdio c:\b\build\slave\google-chrome-rel-win\build\src\chrome\browser\component_updater\pepper_flash_component_installer.cc(326) :error C3861: 'Version': identifier not found Original issue's description: > base: Remove using:: declaration from version.h header. > > BUG=None > R=brettw@chromium.org > > Committed: https://crrev.com/9c2f5dc9c732beb936b41d073bf5ec7adefb0872 > Cr-Commit-Position: refs/heads/master@{#344088} TBR=brettw@chromium.org,tfarina@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/1301883002 Cr-Commit-Position: refs/heads/master@{#344138}
Diffstat (limited to 'base')
-rw-r--r--base/version.h5
-rw-r--r--base/version_unittest.cc3
2 files changed, 5 insertions, 3 deletions
diff --git a/base/version.h b/base/version.h
index 7ce18dc..814acaa 100644
--- a/base/version.h
+++ b/base/version.h
@@ -10,6 +10,7 @@
#include <vector>
#include "base/base_export.h"
+#include "base/basictypes.h"
namespace base {
@@ -65,4 +66,8 @@ class BASE_EXPORT Version {
} // namespace base
+// TODO(xhwang) remove this when all users are updated to explicitly use the
+// namespace
+using base::Version;
+
#endif // BASE_VERSION_H_
diff --git a/base/version_unittest.cc b/base/version_unittest.cc
index 9f6369e..f40ed27 100644
--- a/base/version_unittest.cc
+++ b/base/version_unittest.cc
@@ -4,10 +4,8 @@
#include "base/version.h"
-#include "base/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace base {
namespace {
TEST(VersionTest, DefaultConstructor) {
@@ -154,4 +152,3 @@ TEST(VersionTest, IsValidWildcardString) {
}
} // namespace
-} // namespace base