Skip to content

Commit

Permalink
Merge pull request #7286 from keithc-ca/non-ascii
Browse files Browse the repository at this point in the history
Don't use non-ASCII characters in text files
  • Loading branch information
babsingh committed Mar 20, 2024
2 parents 54b23e9 + da2316d commit ecae9e5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gc/base/standard/ConcurrentGCSATB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ MM_ConcurrentGCSATB::reportConcurrentCollectionStart(MM_EnvironmentBase *env)
/**
* TLH is about to be cleared, we must premark it if SATB is active. This is
* non-trival to do, we must know the start of the last object to mark the proper range of the TLH.
* Arbitrary bits at the end of the TLH cant be marked, this is problematic for sweep.
* Arbitrary bits at the end of the TLH can't be marked, this is problematic for sweep.
*
* To get around this issue we seal the TLH with a bogus/dummy obj at the
* end of the TLH (done before call to this method). With this, we know the precise addr to batch mark to. We have
Expand Down
2 changes: 1 addition & 1 deletion gc/verbose/VerboseWriterFileLoggingBuffered.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ MM_VerboseWriterFileLoggingBuffered::outputString(MM_EnvironmentBase *env, const
if(NULL == _logFileStream) {
/**
* Under normal circumstances, new file should be opened during endOfCycle call.
* This path works as one backup, in case we failed to open the file, well attempt to open it again before outputting the string.
* This path works as one backup, in case we failed to open the file, we'll attempt to open it again before outputting the string.
*/
openFile(env);
}
Expand Down
2 changes: 1 addition & 1 deletion gc/verbose/VerboseWriterFileLoggingSynchronous.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ MM_VerboseWriterFileLoggingSynchronous::outputString(MM_EnvironmentBase *env, co
if(-1 == _logFileDescriptor) {
/**
* Under normal circumstances, new file should be opened during endOfCycle call.
* This path works as one backup, in case we failed to open the file, well attempt to open it again before outputting the string.
* This path works as one backup, in case we failed to open the file, we'll attempt to open it again before outputting the string.
*/
openFile(env);
}
Expand Down
2 changes: 1 addition & 1 deletion include_core/omrportsocktypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
#if defined(OMR_OS_WINDOWS)
typedef SOCKET omr_os_socket;
typedef struct sockaddr_storage omr_os_sockaddr_storage; /* For IPv4 or IPv6 addresses */
typedef struct addrinfoW omr_os_addrinfo; /* addrinfo structure Unicode, for IPv4 or IPv6 */
typedef struct addrinfoW omr_os_addrinfo; /* addrinfo structure - Unicode, for IPv4 or IPv6 */
#else /* defined(OMR_OS_WINDOWS) */
typedef int omr_os_socket;
typedef struct sockaddr_storage omr_os_sockaddr_storage; /* For IPv4 or IPv6 addresses */
Expand Down
4 changes: 2 additions & 2 deletions include_core/thread_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,8 @@ intptr_t
omrthread_monitor_get_acquired_count(omrthread_monitor_t monitor);

/**
* Return thread that currently owns the monitor. Null
* will be returned if monitor is not owned.
* Return thread that currently owns the monitor.
* Null will be returned if monitor is not owned.
* @param monitor
* @return omrthread_t
*/
Expand Down

0 comments on commit ecae9e5

Please sign in to comment.