mirror of
https://github.com/eclipse/upm.git
synced 2025-03-14 20:47:30 +03:00
Merge c7d7718c21828883a4d8eea585b89185a1eaf150 into d6f76ff8c231417666594214679c49399513112e
This commit is contained in:
commit
17d9e2801e
@ -272,7 +272,9 @@ if (CMAKE_VERSION VERSION_LESS "3.1")
|
|||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
# 3.1+ uses this generic method to enable c++11
|
# 3.1+ uses this generic method to enable c++11
|
||||||
set (CMAKE_CXX_STANDARD 11)
|
if(NOT "${CMAKE_CXX_STANDARD}")
|
||||||
|
set (CMAKE_CXX_STANDARD 11)
|
||||||
|
endif ()
|
||||||
set (CXX_STANDARD_REQUIRED ON)
|
set (CXX_STANDARD_REQUIRED ON)
|
||||||
set (CXX_EXTENSIONS OFF)
|
set (CXX_EXTENSIONS OFF)
|
||||||
endif()
|
endif()
|
||||||
|
@ -24,7 +24,11 @@
|
|||||||
%typemap(in) uint32_t {
|
%typemap(in) uint32_t {
|
||||||
int ecode2 = 0 ;
|
int ecode2 = 0 ;
|
||||||
if (($input)->IsInt32())
|
if (($input)->IsInt32())
|
||||||
|
%#if (V8_MAJOR_VERSION-0) < 7
|
||||||
$1 = ($input)->Uint32Value();
|
$1 = ($input)->Uint32Value();
|
||||||
|
%#else
|
||||||
|
$1 = ($input)->Uint32Value(SWIGV8_CURRENT_CONTEXT()).FromJust();
|
||||||
|
%#endif
|
||||||
else
|
else
|
||||||
SWIG_exception_fail(SWIG_ArgError(ecode2), "failed to convert uint32");
|
SWIG_exception_fail(SWIG_ArgError(ecode2), "failed to convert uint32");
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,7 @@ void cleanUp()
|
|||||||
/* Call the v8 garbage collector as long as there is memory to clean up
|
/* Call the v8 garbage collector as long as there is memory to clean up
|
||||||
* See https://codereview.chromium.org/412163003 for this API change
|
* See https://codereview.chromium.org/412163003 for this API change
|
||||||
*/
|
*/
|
||||||
#if (SWIG_V8_VERSION < 0x032838)
|
#if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032838)
|
||||||
while (!v8::V8::IdleNotificationDeadline())
|
while (!v8::V8::IdleNotificationDeadline())
|
||||||
#else
|
#else
|
||||||
while (!v8::Isolate::GetCurrent()->IdleNotificationDeadline(1000))
|
while (!v8::Isolate::GetCurrent()->IdleNotificationDeadline(1000))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user