diff --git a/toolkit/components/places/AsyncFaviconHelpers.cpp b/toolkit/components/places/AsyncFaviconHelpers.cpp index 6af8dc19ccb2..d86ac77520f8 100644 --- a/toolkit/components/places/AsyncFaviconHelpers.cpp +++ b/toolkit/components/places/AsyncFaviconHelpers.cpp @@ -230,7 +230,7 @@ FetchIconInfo(nsRefPtr& aDB, rv = stmt->GetIsNull(1, &isNull); NS_ENSURE_SUCCESS(rv, rv); if (!isNull) { - rv = stmt->GetInt64(1, &_icon.expiration); + rv = stmt->GetInt64(1, reinterpret_cast(&_icon.expiration)); NS_ENSURE_SUCCESS(rv, rv); } diff --git a/toolkit/components/places/History.cpp b/toolkit/components/places/History.cpp index 8c0f7e4c5468..668a38b83d25 100644 --- a/toolkit/components/places/History.cpp +++ b/toolkit/components/places/History.cpp @@ -938,7 +938,7 @@ private: NS_ENSURE_SUCCESS(rv, false); rv = stmt->GetInt64(1, &_place.sessionId); NS_ENSURE_SUCCESS(rv, false); - rv = stmt->GetInt64(2, &_place.visitTime); + rv = stmt->GetInt64(2, reinterpret_cast(&_place.visitTime)); NS_ENSURE_SUCCESS(rv, false); // If we have been given a visit threshold start time, go ahead and diff --git a/toolkit/components/places/nsIBrowserHistory.idl b/toolkit/components/places/nsIBrowserHistory.idl index 464cfa6e6477..e8d3ec4dcac5 100644 --- a/toolkit/components/places/nsIBrowserHistory.idl +++ b/toolkit/components/places/nsIBrowserHistory.idl @@ -65,8 +65,8 @@ interface nsIBrowserHistory : nsIGlobalHistory2 * * @note The removal happens in a batch. */ - void removePagesByTimeframe(in long long aBeginTime, - in long long aEndTime); + void removePagesByTimeframe(in PRTime aBeginTime, + in PRTime aEndTime); /** * Removes all visits in a given timeframe. @@ -80,8 +80,8 @@ interface nsIBrowserHistory : nsIGlobalHistory2 * * @note The removal happens in a batch. */ - void removeVisitsByTimeframe(in long long aBeginTime, - in long long aEndTime); + void removeVisitsByTimeframe(in PRTime aBeginTime, + in PRTime aEndTime); /** * Removes all existing pages from global history. diff --git a/toolkit/components/places/nsNavBookmarks.cpp b/toolkit/components/places/nsNavBookmarks.cpp index 23b8f5c0942e..9082d7aa23fd 100644 --- a/toolkit/components/places/nsNavBookmarks.cpp +++ b/toolkit/components/places/nsNavBookmarks.cpp @@ -1468,9 +1468,9 @@ nsNavBookmarks::FetchItemInfo(int64_t aItemId, NS_ENSURE_SUCCESS(rv, rv); rv = stmt->GetInt32(6, &_bookmark.type); NS_ENSURE_SUCCESS(rv, rv); - rv = stmt->GetInt64(7, &_bookmark.dateAdded); + rv = stmt->GetInt64(7, reinterpret_cast(&_bookmark.dateAdded)); NS_ENSURE_SUCCESS(rv, rv); - rv = stmt->GetInt64(8, &_bookmark.lastModified); + rv = stmt->GetInt64(8, reinterpret_cast(&_bookmark.lastModified)); NS_ENSURE_SUCCESS(rv, rv); rv = stmt->GetUTF8String(9, _bookmark.guid); NS_ENSURE_SUCCESS(rv, rv); @@ -1869,10 +1869,10 @@ nsNavBookmarks::ProcessFolderNodeRow( node = new nsNavHistoryFolderResultNode(title, aOptions, id); rv = aRow->GetInt64(nsNavHistory::kGetInfoIndex_ItemDateAdded, - &node->mDateAdded); + reinterpret_cast(&node->mDateAdded)); NS_ENSURE_SUCCESS(rv, rv); rv = aRow->GetInt64(nsNavHistory::kGetInfoIndex_ItemLastModified, - &node->mLastModified); + reinterpret_cast(&node->mLastModified)); NS_ENSURE_SUCCESS(rv, rv); } else { @@ -1884,10 +1884,10 @@ nsNavBookmarks::ProcessFolderNodeRow( node->mItemId = id; rv = aRow->GetInt64(nsNavHistory::kGetInfoIndex_ItemDateAdded, - &node->mDateAdded); + reinterpret_cast(&node->mDateAdded)); NS_ENSURE_SUCCESS(rv, rv); rv = aRow->GetInt64(nsNavHistory::kGetInfoIndex_ItemLastModified, - &node->mLastModified); + reinterpret_cast(&node->mLastModified)); NS_ENSURE_SUCCESS(rv, rv); } @@ -2277,7 +2277,7 @@ nsNavBookmarks::GetBookmarksForURI(nsIURI* aURI, NS_ENSURE_SUCCESS(rv, rv); rv = stmt->GetInt64(2, &bookmark.parentId); NS_ENSURE_SUCCESS(rv, rv); - rv = stmt->GetInt64(3, &bookmark.lastModified); + rv = stmt->GetInt64(3, reinterpret_cast(&bookmark.lastModified)); NS_ENSURE_SUCCESS(rv, rv); rv = stmt->GetUTF8String(4, bookmark.parentGuid); NS_ENSURE_SUCCESS(rv, rv); diff --git a/toolkit/components/places/nsNavHistory.cpp b/toolkit/components/places/nsNavHistory.cpp index 7d537fc65777..1b3472e74a84 100644 --- a/toolkit/components/places/nsNavHistory.cpp +++ b/toolkit/components/places/nsNavHistory.cpp @@ -616,7 +616,7 @@ nsNavHistory::FindLastVisit(nsIURI* aURI, NS_ENSURE_SUCCESS(rv, false); rv = stmt->GetInt64(1, aSessionID); NS_ENSURE_SUCCESS(rv, false); - rv = stmt->GetInt64(2, aTime); + rv = stmt->GetInt64(2, reinterpret_cast(aTime)); NS_ENSURE_SUCCESS(rv, false); return true; } @@ -4357,7 +4357,7 @@ nsNavHistory::CheckIsRecentEvent(RecentEventHash* hashTable, const nsACString& url) { PRTime eventTime; - if (hashTable->Get(url, &eventTime)) { + if (hashTable->Get(url, reinterpret_cast(&eventTime))) { hashTable->Remove(url); if (eventTime > GetNow() - RECENT_EVENT_THRESHOLD) return true; diff --git a/toolkit/components/places/nsNavHistoryQuery.cpp b/toolkit/components/places/nsNavHistoryQuery.cpp index 6d6fec1c13ad..ead4f15e3f5e 100644 --- a/toolkit/components/places/nsNavHistoryQuery.cpp +++ b/toolkit/components/places/nsNavHistoryQuery.cpp @@ -1604,14 +1604,14 @@ AppendInt64KeyValueIfNonzero(nsACString& aString, nsINavHistoryQuery* aQuery, Int64QueryGetter getter) { - int64_t value; + PRTime value; DebugOnly rv = (aQuery->*getter)(&value); NS_ASSERTION(NS_SUCCEEDED(rv), "Failure getting value"); if (value) { AppendAmpersandIfNonempty(aString); aString += aName; nsCAutoString appendMe("="); - appendMe.AppendInt(value); + appendMe.AppendInt(static_cast(value)); aString.Append(appendMe); } }