Changeset 143 for Mulberry/trunk/Sources_Common/Application/Server/CServerBrowseCommon.cp

Timestamp:

11/20/07 23:45:14 (1 year ago)

Author:

daboo

Message:

Merge of win32-merge branch.

Files:

• Mulberry/trunk/Sources_Common/Application/Server/CServerBrowseCommon.cp (modified) (3 diffs)

Mulberry/trunk/Sources_Common/Application/Server/CServerBrowseCommon.cp

@@ -50 +50 @@
 
 #include <typeinfo>
-
-#if __dest_os == __win32_os
-// BUG in Metrowerks Compiler - need this specialization
-inline void allocator<CServerBrowse::SServerBrowseData>::deallocate(CServerBrowse::SServerBrowseData* p, size_t)
-{
-        delete p;
-}
-#endif
 
 #pragma mark ____________________________Message Handling
@@ -1669 +1661 @@
 
                                 // Adjust index to last remaining server
-                                index = ::min(index, (mShowFavourites ? CMailAccountManager::sMailAccountManager->FetchServerOffset() : 0) + 1);
+                                index = min(index, (mShowFavourites ? CMailAccountManager::sMailAccountManager->FetchServerOffset() : 0) + 1);
 
                                 // Remove this and all children
@@ -1819 +1811 @@
 
                                 // Get its index (modified after delete) and remove its hierarchy
-                                index = ::min(index, FetchIndexOf(flatten));
+                                index = min(index, FetchIndexOf(flatten));
                                 RemoveRows(1, index, false);