diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 20:53:39 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 20:53:39 +0000 |
| commit | 00bb04380cd76943ec66366e315122f9f7670b98 (patch) | |
| tree | cca8e4f99046e0d1484597305408188a06ee3cc7 | |
| parent | 059878c500342832119e65c6c455d2aea619c2d4 (diff) | |
| download | chromium_src-00bb04380cd76943ec66366e315122f9f7670b98.zip chromium_src-00bb04380cd76943ec66366e315122f9f7670b98.tar.gz chromium_src-00bb04380cd76943ec66366e315122f9f7670b98.tar.bz2 | |
Fix unit test compiling on Linux
Review URL: http://codereview.chromium.org/295034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29704 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 1 insertions, 13 deletions
diff --git a/chrome/browser/sync/notifier/communicator/single_login_attempt.cc b/chrome/browser/sync/notifier/communicator/single_login_attempt.cc index 01cc24b..86e04aa 100644 --- a/chrome/browser/sync/notifier/communicator/single_login_attempt.cc +++ b/chrome/browser/sync/notifier/communicator/single_login_attempt.cc @@ -530,7 +530,7 @@ void SingleLoginAttempt::HandleConnectionError( // Yep, its a "stream:error" with "see-other-host" text, let's parse // out the server:port, and then reconnect with that. const std::string& redirect = text->BodyText(); - unsigned int colon = redirect.find(":"); + size_t colon = redirect.find(":"); int redirect_port = kDefaultXmppPort; std::string redirect_server; if (colon == std::string::npos) { diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc index fd1eb34..26577d6 100644 --- a/chrome/browser/sync/syncable/directory_backing_store.cc +++ b/chrome/browser/sync/syncable/directory_backing_store.cc @@ -28,10 +28,6 @@ // infinity seems like the best choice here. const int kDirectoryBackingStoreBusyTimeoutMs = std::numeric_limits<int>::max(); -// If sizeof(time_t) != sizeof(int32) we need to alter or expand the sqlite -// datatype. -COMPILE_ASSERT(sizeof(time_t) == sizeof(int32), time_t_is_not_int32); - using std::string; namespace syncable { diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc index a182303..29d8430 100644 --- a/chrome/browser/sync/syncable/syncable.cc +++ b/chrome/browser/sync/syncable/syncable.cc @@ -58,10 +58,6 @@ static const InvariantCheckLevel kInvariantCheckLevel = VERIFY_IN_MEMORY; static const int kInvariantCheckMaxMs = 50; } // namespace -// if sizeof(time_t) != sizeof(int32) we need to alter or expand the sqlite -// datatype. -COMPILE_ASSERT(sizeof(time_t) == sizeof(int32), time_t_is_not_int32); - using browser_sync::FastDump; using browser_sync::SyncerUtil; using std::string; diff --git a/third_party/libjingle/overrides/talk/base/basictypes.h b/third_party/libjingle/overrides/talk/base/basictypes.h index 3196ab3..9de73d4 100644 --- a/third_party/libjingle/overrides/talk/base/basictypes.h +++ b/third_party/libjingle/overrides/talk/base/basictypes.h @@ -16,8 +16,6 @@ #define INT_TYPES_DEFINED #ifdef COMPILER_MSVC typedef __int64 int64; -#else -typedef long long int64; #endif /* COMPILER_MSVC */ #ifdef COMPILER_MSVC @@ -27,8 +25,6 @@ typedef __int64 int64; #define UINT64_C(x) x ## UI64 #define INT64_F "I64" #else -typedef unsigned long long uint64; -typedef long long int64; #ifndef INT64_C #define INT64_C(x) x ## LL #endif |