diff --git a/mozilla/cmd/macfe/gui/CURLDragHelper.cp b/mozilla/cmd/macfe/gui/CURLDragHelper.cp index f3aa71f3273..b0d0049f1d7 100644 --- a/mozilla/cmd/macfe/gui/CURLDragHelper.cp +++ b/mozilla/cmd/macfe/gui/CURLDragHelper.cp @@ -260,21 +260,21 @@ CURLDragHelper :: ExtractURLAndTitle ( DragReference inDragRef, ItemReference in else if ( theDataSize ) { vector urlAndTitle ( theDataSize + 1 ); ThrowIfOSErr_( ::GetFlavorData( inDragRef, inItemRef, emBookmarkDrag, - urlAndTitle.begin(), &theDataSize, 0 ) ); + &(*urlAndTitle.begin()), &theDataSize, 0 ) ); urlAndTitle[theDataSize] = NULL; - char* title = find(urlAndTitle.begin(), urlAndTitle.end(), '\r'); - if ( title != urlAndTitle.end() ) { + char* title = &(*find(urlAndTitle.begin(), urlAndTitle.end(), '\r')); + if ( title != &(*urlAndTitle.end()) ) { // hack up the data string into it's components title[0] = NULL; title++; - char* url = urlAndTitle.begin(); + char* url = &(*urlAndTitle.begin()); // assign those components to the output parameters outURL = url; outTitle = title; } else { - outURL = urlAndTitle.begin(); + outURL = &(*urlAndTitle.begin()); outTitle = ""; } } @@ -419,8 +419,8 @@ CURLDragMixin :: ReceiveDragItem ( DragReference inDragRef, DragAttributes /*inD vector textData ( theDataSize + 1 ); try { ThrowIfOSErr_( ::GetFlavorData( inDragRef, inItemRef, 'TEXT', - textData.begin(), &theDataSize, 0 ) ); - HandleDropOfText ( textData.begin() ); + &(*textData.begin()), &theDataSize, 0 ) ); + HandleDropOfText ( &(*textData.begin()) ); } catch ( ... ) { DebugStr("\pError getting flavor data for TEXT"); @@ -473,9 +473,9 @@ CURLDragMixin :: FindBestFlavor ( DragReference inDragRef, ItemReference inItemR ItemReference mItemRef; }; - FlavorType* result = find_if ( AcceptedFlavors().begin(), AcceptedFlavors().end(), - FindBestFlavor_imp(inDragRef, inItemRef) ); - if ( result != AcceptedFlavors().end() ) { + FlavorType* result = &(* find_if ( AcceptedFlavors().begin(), AcceptedFlavors().end(), + FindBestFlavor_imp(inDragRef, inItemRef) ) ); + if ( result != &(*AcceptedFlavors().end()) ) { oFlavor = *result; return true; } diff --git a/mozilla/cmd/macfe/rdfui/CHyperTreeHeader.cp b/mozilla/cmd/macfe/rdfui/CHyperTreeHeader.cp index 24d2213d2da..1032eea5005 100644 --- a/mozilla/cmd/macfe/rdfui/CHyperTreeHeader.cp +++ b/mozilla/cmd/macfe/rdfui/CHyperTreeHeader.cp @@ -117,7 +117,7 @@ CHyperTreeHeader::SetUpColumns ( HT_View inView ) while (iter != dataVector.end()) { Int32 byteCount = sizeof(LTableHeader::SColumnData); - dataStream.PutBytes(iter, byteCount); + dataStream.PutBytes(&(*iter), byteCount); ++iter; } if (mColumnData)