From 45d2d580003b597935fb34bc69ce342478aa7b89 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Thu, 15 Mar 2012 07:40:29 +0000
Subject: [PATCH] Renamed MOCK_STATIC_FUNCTION to MOCK_STATIC_METHOD

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@423 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/libraries/turtle/mock.hpp              | 5 ++---
 src/tests/turtle_test/integration_test.cpp | 4 ++--
 src/tests/turtle_test/mock_test.cpp        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp
index 6ff37d8..1cc53ef 100644
--- a/src/libraries/turtle/mock.hpp
+++ b/src/libraries/turtle/mock.hpp
@@ -25,7 +25,6 @@
 #include <boost/mpl/pop_front.hpp>
 #define BOOST_TYPEOF_SILENT
 #include <boost/typeof/typeof.hpp>
-#include <boost/utility/enable_if.hpp>
 #include <boost/type_traits.hpp>
 
 namespace mock
@@ -165,9 +164,9 @@ namespace detail
     }
 #define MOCK_FUNCTION(F, n, S, t) \
     MOCK_FUNCTION_STUB(F, n, S, t,,)
-#define MOCK_STATIC_FUNCTION(F, n, S, t) \
+#define MOCK_STATIC_METHOD(F, n, S, t) \
     MOCK_FUNCTION_STUB(F, n, S, t, static,)
-#define MOCK_STATIC_FUNCTION_TPL(F, n, S, t) \
+#define MOCK_STATIC_METHOD_TPL(F, n, S, t) \
     MOCK_FUNCTION_STUB(F, n, S, t, static, BOOST_DEDUCED_TYPENAME)
 
 #define MOCK_EXPECT(t) MOCK_MOCKER(t).expect( __FILE__, __LINE__ )
diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp
index 6b2feac..6ffc83b 100644
--- a/src/tests/turtle_test/integration_test.cpp
+++ b/src/tests/turtle_test/integration_test.cpp
@@ -467,7 +467,7 @@ namespace
 {
     struct some_class
     {
-        MOCK_STATIC_FUNCTION( some_static_method, 1, float( int ), some_static_method )
+        MOCK_STATIC_METHOD( some_static_method, 1, float( int ), some_static_method )
     };
 }
 
@@ -484,7 +484,7 @@ namespace
     template< typename T >
     struct some_template_class
     {
-        MOCK_STATIC_FUNCTION_TPL( some_static_method, 1, float( T ), some_static_method )
+        MOCK_STATIC_METHOD_TPL( some_static_method, 1, float( T ), some_static_method )
     };
 }
 
diff --git a/src/tests/turtle_test/mock_test.cpp b/src/tests/turtle_test/mock_test.cpp
index 3016baf..23d241e 100644
--- a/src/tests/turtle_test/mock_test.cpp
+++ b/src/tests/turtle_test/mock_test.cpp
@@ -311,7 +311,7 @@ namespace
 {
     MOCK_CLASS( static_function_class )
     {
-        MOCK_STATIC_FUNCTION( f, 1, float( int ), f )
+        MOCK_STATIC_METHOD( f, 1, float( int ), f )
     };
 }