Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Unified Diff: runtime/vm/dart_api_impl.cc

Issue 8352014: Minimal change to get win32 build working again. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/dart_api_impl.cc
===================================================================
--- runtime/vm/dart_api_impl.cc (revision 566)
+++ runtime/vm/dart_api_impl.cc (working copy)
@@ -1392,8 +1392,8 @@
Zone zone; // Setup a VM zone as we are creating some handles.
HandleScope scope; // Setup a VM handle scope.
Dart_Result result = LookupStaticField(cls, name, kGetter);
- if (!Dart_IsValidResult(result)) {
- RETURN_FAILURE(Dart_GetErrorCString(result));
+ if (!::Dart_IsValidResult(result)) {
+ return result;
}
Object& retval = Object::Handle();
const Object& obj = Object::Handle(Api::UnwrapHandle(Dart_GetResult(result)));
@@ -1407,7 +1407,7 @@
func ^= obj.raw();
GrowableArray<const Object*> args;
InvokeStatic(func, args, &result);
- if (Dart_IsValidResult(result)) {
+ if (::Dart_IsValidResult(result)) {
Dart_Handle result_obj = Dart_GetResult(result);
if (Dart_ExceptionOccurred(result_obj)) {
RETURN_FAILURE("An exception occurred when getting the static field");
@@ -1425,8 +1425,8 @@
Zone zone; // Setup a VM zone as we are creating some handles.
HandleScope scope; // Setup a VM handle scope.
Dart_Result result = LookupStaticField(cls, name, kSetter);
- if (!Dart_IsValidResult(result)) {
- RETURN_FAILURE(Dart_GetErrorCString(result));
+ if (!::Dart_IsValidResult(result)) {
+ return result;
}
Field& fld = Field::Handle();
fld ^= Api::UnwrapHandle(Dart_GetResult(result));
@@ -1452,14 +1452,14 @@
Instance& object = Instance::Handle();
object ^= param.raw();
Dart_Result result = LookupInstanceField(object, name, kGetter);
- if (!Dart_IsValidResult(result)) {
- RETURN_FAILURE(Dart_GetErrorCString(result));
+ if (!::Dart_IsValidResult(result)) {
+ return result;
}
Function& func = Function::Handle();
func ^= Api::UnwrapHandle(Dart_GetResult(result));
GrowableArray<const Object*> arguments;
InvokeDynamic(object, func, arguments, &result);
- if (Dart_IsValidResult(result)) {
+ if (::Dart_IsValidResult(result)) {
Dart_Handle result_obj = Dart_GetResult(result);
if (Dart_ExceptionOccurred(result_obj)) {
RETURN_FAILURE("An exception occurred when accessing the instance field");
@@ -1481,8 +1481,8 @@
Instance& object = Instance::Handle();
object ^= param.raw();
Dart_Result result = LookupInstanceField(object, name, kSetter);
- if (!Dart_IsValidResult(result)) {
- RETURN_FAILURE(Dart_GetErrorCString(result));
+ if (!::Dart_IsValidResult(result)) {
+ return result;
}
Function& func = Function::Handle();
func ^= Api::UnwrapHandle(Dart_GetResult(result));
@@ -1490,7 +1490,7 @@
const Object& arg = Object::Handle(Api::UnwrapHandle(value));
arguments.Add(&arg);
InvokeDynamic(object, func, arguments, &result);
- if (Dart_IsValidResult(result)) {
+ if (::Dart_IsValidResult(result)) {
Dart_Handle result_obj = Dart_GetResult(result);
if (Dart_ExceptionOccurred(result_obj)) {
RETURN_FAILURE("An exception occurred when setting the instance field");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698