commit e7169e23443638e544a8a985fec5860a791beece
author Andrew Hsieh <andrewhsieh@google.com> Thu Mar 07 15:45:44 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 07 15:45:45 2013 +0000
tree 92e20b88ff8e04fd71fda718d8d8b2ade021c07a
parent 0487d5b856a28a204b6624ab56b30c082bab6be7
parent e61315226e5dc3db9292e78d220d19141602ae8a

Merge "Refine pr23299 exception test."

tests/device/test-stlport_shared-exception/jni/pr23299.cpp

diff --git a/tests/device/test-stlport_shared-exception/jni/pr23299.cpp b/tests/device/test-stlport_shared-exception/jni/pr23299.cpp
index 94a414a..844d68c 100644
--- a/tests/device/test-stlport_shared-exception/jni/pr23299.cpp
+++ b/tests/device/test-stlport_shared-exception/jni/pr23299.cpp
@@ -6,16 +6,19 @@
 
 struct A
 {
-  virtual int a () {}
+  virtual int a () { return 0; }
 };
+
 struct B : public A
 {
-  virtual int b () {}
+  virtual int b () { return 0; }
 };
+
 struct C : public A
 {
-  virtual int c () {}
+  virtual int c () { return 0; }
 };
+
 struct D
 {
   D () { d = 64; }
@@ -24,6 +27,7 @@
 };
 
 int x;
+
 D::~D ()
 {
   x |= 1;
@@ -44,16 +48,15 @@
   int r = c ();
 }
 
-int
-E::c ()
+int E::c ()
 {
   if (x > 10)
     throw 1;
   x |= 2;
+  return 0;
 }
 
-int
-main (void)
+int main (void)
 {
   {
     E e;

tests/device/test-stlport_static-exception/jni/pr23299.cpp

diff --git a/tests/device/test-stlport_static-exception/jni/pr23299.cpp b/tests/device/test-stlport_static-exception/jni/pr23299.cpp
index 94a414a..844d68c 100644
--- a/tests/device/test-stlport_static-exception/jni/pr23299.cpp
+++ b/tests/device/test-stlport_static-exception/jni/pr23299.cpp
@@ -6,16 +6,19 @@
 
 struct A
 {
-  virtual int a () {}
+  virtual int a () { return 0; }
 };
+
 struct B : public A
 {
-  virtual int b () {}
+  virtual int b () { return 0; }
 };
+
 struct C : public A
 {
-  virtual int c () {}
+  virtual int c () { return 0; }
 };
+
 struct D
 {
   D () { d = 64; }
@@ -24,6 +27,7 @@
 };
 
 int x;
+
 D::~D ()
 {
   x |= 1;
@@ -44,16 +48,15 @@
   int r = c ();
 }
 
-int
-E::c ()
+int E::c ()
 {
   if (x > 10)
     throw 1;
   x |= 2;
+  return 0;
 }
 
-int
-main (void)
+int main (void)
 {
   {
     E e;