Skip to content

fix: fix implicit conversion to ON_wString is not cross-architecture #34

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
aminya wants to merge 1 commit into
base: 7.x
Choose a base branch
from
Open

fix: fix implicit conversion to ON_wString is not cross-architecture #34

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions opennurbs_file_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3302,13 +3302,13 @@ void ON_ContentHash::Dump(

const ON_wString content_time
= ( m_content_time <= 0 )
? L"unknown"
? static_cast<ON_wString>(L"unknown")
: SecondsSinceJanOne1970UTCToString(m_content_time);
text_log.Print(L"Content last modified time = %ls\n",static_cast<const wchar_t*>(content_time));

const ON_wString hash_time
= ( m_hash_time <= 0 )
? L"unknown"
? static_cast<ON_wString>(L"unknown")
: SecondsSinceJanOne1970UTCToString(m_hash_time);
text_log.Print(L"Content hash calculated time = %ls\n",static_cast<const wchar_t*>(content_time));

Expand Down
2 changes: 1 addition & 1 deletion opennurbs_version_number.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ const ON_String ON_VersionNumberToString(
str_version =
(0 != version_number)
? ON_String::FormatToString("0x%08X", version_number)
: "0";
: static_cast<ON_String>("0");
}

return str_version;
Expand Down