mirror of
https://github.com/mcneel/opennurbs.git
synced 2026-03-17 06:46:01 +08:00
Sync changes from upstream repository
This commit is contained in:
@@ -85,8 +85,8 @@ int ON_String::ScanBufferVargs(
|
||||
va_list args
|
||||
)
|
||||
{
|
||||
#if defined(ON_COMPILER_CLANG)
|
||||
#if defined(ON_RUNTIME_ANDROID)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
if (nullptr == buffer || nullptr == format)
|
||||
return -1;
|
||||
return vsscanf(buffer, format, args);
|
||||
@@ -148,8 +148,8 @@ int ON_wString::ScanBufferVargs(
|
||||
va_list args
|
||||
)
|
||||
{
|
||||
#if defined(ON_COMPILER_CLANG)
|
||||
#if defined(ON_RUNTIME_ANDROID)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
if (nullptr == buffer || nullptr == format)
|
||||
return -1;
|
||||
return swscanf(buffer, format, args);
|
||||
@@ -397,8 +397,8 @@ const char* ON_String::ToNumber(
|
||||
local_buffer[local_buffer_count++] = 0;
|
||||
|
||||
double x = value_on_failure;
|
||||
#if defined(ON_COMPILER_CLANG)
|
||||
#if defined(ON_RUNTIME_ANDROID)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
if (1 == sscanf(local_buffer, "%lg", &x))
|
||||
{
|
||||
*value = x;
|
||||
@@ -639,8 +639,8 @@ const wchar_t* ON_wString::ToNumber(
|
||||
local_buffer[local_buffer_count++] = 0;
|
||||
|
||||
double x = value_on_failure;
|
||||
#if defined(ON_COMPILER_CLANG)
|
||||
#if defined(ON_RUNTIME_ANDROID)
|
||||
#if defined(ON_COMPILER_CLANG) || defined(ON_RUNTIME_LINUX)
|
||||
#if defined(ON_RUNTIME_ANDROID) || defined(ON_RUNTIME_LINUX)
|
||||
if (1 == sscanf(local_buffer, "%lg", &x))
|
||||
{
|
||||
*value = x;
|
||||
|
||||
Reference in New Issue
Block a user