Skip to content

Resolving issue #101 #107

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

Open
jedeweb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolving issue #101 #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion cxxtest/XmlFormatter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,15 +597,21 @@ class XmlFormatter : public TestListener
{
std::string retVal;
const time_t now(time(NULL));
char current_date_string[27];

#ifdef WIN32
#ifdef _MSC_VER
char current_date_string[27];
if (ctime_s(current_date_string, sizeof(current_date_string)-1, &now) == 0)
{
retVal = current_date_string;
retVal.erase(retVal.find_last_not_of(" \n\r\t")+1); // trim trailing whitespace
}
#else
retVal.append(ctime(&now));
retVal.erase(retVal.find_last_not_of(" \n\r\t")+1); // trim trailing whitespace
#endif
#else
char current_date_string[27];
const size_t n = strlen(ctime_r(&now, current_date_string));
if (n)
{
Expand Down