Skip to content

Commit

Permalink
Merge pull request #468 from vancem/WarningFix
Browse files Browse the repository at this point in the history
Fix build warnings
  • Loading branch information
vancem authored Dec 15, 2017
2 parents 8822827 + 080d426 commit cd10c78
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
26 changes: 14 additions & 12 deletions src/PerfView/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -979,20 +979,22 @@ private static bool CreateConsole()
});

return true;
#endif
#endif
}

#if !DOTNET_CORE
static Thread s_threadToInterrupt;
static int s_controlCPressed = 0;
#endif

#endregion
#endregion
}
#endregion
#endregion
}

/// <summary>
/// APIs for logging usage data and feedback.
/// </summary>
public static class AppLog
/// <summary>
/// APIs for logging usage data and feedback.
/// </summary>
public static class AppLog
{
/// <summary>
/// Returns true if you have access to the file share where we log feedback
Expand Down Expand Up @@ -1146,7 +1148,7 @@ public static string BuildDate
}
}

#region private
#region private


private static string FeedbackServer { get { return "clrMain"; } }
Expand Down Expand Up @@ -1189,7 +1191,7 @@ private static bool WriteFeedbackToLog(string filePath, string message)
}
return false;
}
#endregion
#endregion
}

/// <summary>
Expand Down Expand Up @@ -1235,9 +1237,9 @@ protected override void Dispose(bool disposing)
m_terseLog.Dispose();
m_verboseLog.Dispose();
}
#region private
#region private
TextWriter m_verboseLog;
TextWriter m_terseLog;
#endregion
#endregion
}
}
3 changes: 1 addition & 2 deletions src/TraceEvent/Stacks/RecursionGuard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Microsoft.Diagnostics.Tracing.Stacks
{
/// <summary>
/// This structure provides a clean API for a lightweight recursion stack guard to prevent
/// <see cref="StackOverflowException"/>.
/// This structure provides a clean API for a lightweight recursion stack guard to prevent StackOverflow exceptions
/// </summary>
internal struct RecursionGuard
{
Expand Down

0 comments on commit cd10c78

Please sign in to comment.