Updated to gmock-1.7.0

[alexxy/gromacs.git] / src / external / gmock-1.7.0 / include / gmock / gmock-actions.h

diff --git a/src/external/gmock-1.6.0/include/gmock/gmock-actions.h b/src/external/gmock-1.7.0/include/gmock/gmock-actions.h
similarity index 99%
rename from src/external/gmock-1.6.0/include/gmock/gmock-actions.h
rename to src/external/gmock-1.7.0/include/gmock/gmock-actions.h
index d6a3e148676979c6cc3a0e4d99f9debb9b75d401..7e9708ec29ead90abc67464833e3dc3d0fdfa909 100644 (file)
--- a/src/external/gmock-1.6.0/include/gmock/gmock-actions.h
+++ b/src/external/gmock-1.7.0/include/gmock/gmock-actions.h
@@ -36,13 +36,13 @@
 #ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
 #define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_
 
-#include <algorithm>
-#include <string>
-
 #ifndef _WIN32_WCE
 # include <errno.h>
 #endif
 
+#include <algorithm>
+#include <string>
+
 #include "gmock/internal/gmock-internal-utils.h"
 #include "gmock/internal/gmock-port.h"
 
@@ -189,6 +189,7 @@ class DefaultValue {
     return value_ == NULL ?
         internal::BuiltInDefaultValue<T>::Get() : *value_;
   }
+
  private:
   static const T* value_;
 };
@@ -224,6 +225,7 @@ class DefaultValue<T&> {
     return address_ == NULL ?
         internal::BuiltInDefaultValue<T&>::Get() : *address_;
   }
+
  private:
   static T* address_;
 };