Skip to content

Update live with current master #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 17, 2019
+3 −3
Merged

Update live with current master #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d371656
Corrected variable name in BlockingCollection<T> example (#909)
May 16, 2019
31197c7
Corrected disposed pattern (#910)
May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion snippets/csharp/VS_Snippets_CLR/conceptual.disposable/cs/derived1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void WriteFileInfo()
bool result = WriteFile(safeHandle, output, output.Length, out bytesWritten, IntPtr.Zero);
}

protected new virtual void Dispose(bool disposing)
protected override void Dispose(bool disposing)
{
if (disposed) return;

Expand Down
2 changes: 1 addition & 1 deletion snippets/csharp/VS_Snippets_Misc/cds_blockingcollection/cs/blockingcollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static void Main()
{

Data data = null;
// Blocks if number.Count == 0
// Blocks if dataItems.Count == 0.
// IOE means that Take() was called on a completed collection.
// Some other thread can call CompleteAdding after we pass the
// IsCompleted check but before we call Take.
Expand Down
2 changes: 1 addition & 1 deletion snippets/visualbasic/VS_Snippets_Misc/cds_blockingcollection/vb/introsnippetsbc.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Module IntroSnippetsBC
While moreItemsToAdd = True
Dim item As Data = GetData()

' Blocks if numbers.Count = dataItems.BoundedCapacity
' Blocks if dataItems.Count = dataItems.BoundedCapacity.
dataItems.Add(item)
End While

Expand Down