commit 5b95fa7b16023c1e1ab0b00f7ce73a2d46a95911
author zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> Tue Jan 27 22:28:45 2009 +0000
committer zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> Tue Jan 27 22:28:45 2009 +0000
tree acd069ab567d32a1b08eb798d0d491d9a85246f7
parent 6a896b5ec607a54d86bbd2efdbc0248754b042e1

Improves error messages for undefined return value (by Sverre Sundsdal); improves gmock_doctor.

include/gmock/gmock-actions.h

diff --git a/include/gmock/gmock-actions.h b/include/gmock/gmock-actions.h
index a432758..95e075d 100644
--- a/include/gmock/gmock-actions.h
+++ b/include/gmock/gmock-actions.h
@@ -69,6 +69,8 @@
 template <typename T>
 class BuiltInDefaultValue {
  public:
+  // This function returns true iff type T has a built-in default value.
+  static bool Exists() { return false; }
   static T Get() {
     Assert(false, __FILE__, __LINE__,
            "Default action undefined for the function return type.");
@@ -83,6 +85,7 @@
 template <typename T>
 class BuiltInDefaultValue<const T> {
  public:
+  static bool Exists() { return BuiltInDefaultValue<T>::Exists(); }
   static T Get() { return BuiltInDefaultValue<T>::Get(); }
 };
 
@@ -91,6 +94,7 @@
 template <typename T>
 class BuiltInDefaultValue<T*> {
  public:
+  static bool Exists() { return true; }
   static T* Get() { return NULL; }
 };
 
@@ -100,6 +104,7 @@
   template <> \
   class BuiltInDefaultValue<type> { \
    public: \
+    static bool Exists() { return true; } \
     static type Get() { return value; } \
   }
 
@@ -191,6 +196,12 @@
   // Returns true iff the user has set the default value for type T.
   static bool IsSet() { return value_ != NULL; }
 
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T>::Exists();
+  }
+
   // Returns the default value for type T if the user has set one;
   // otherwise returns the built-in default value if there is one;
   // otherwise aborts the process.
@@ -220,6 +231,12 @@
   // Returns true iff the user has set the default value for type T&.
   static bool IsSet() { return address_ != NULL; }
 
+  // Returns true if T has a default return value set by the user or there
+  // exists a built-in default value.
+  static bool Exists() {
+    return IsSet() || internal::BuiltInDefaultValue<T&>::Exists();
+  }
+
   // Returns the default value for type T& if the user has set one;
   // otherwise returns the built-in default value if there is one;
   // otherwise aborts the process.
@@ -236,6 +253,7 @@
 template <>
 class DefaultValue<void> {
  public:
+  static bool Exists() { return true; }
   static void Get() {}
 };