[Mockpp-commits] mockpp/mockpp/builder MatchBuilder.h,1.34,1.35

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22866/mockpp/builder

Modified Files:
	MatchBuilder.h 
Log Message:
scope fixes for gcc-3.4.3

Index: MatchBuilder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/builder/MatchBuilder.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- MatchBuilder.h	30 Jan 2005 12:09:17 -0000	1.34
+++ MatchBuilder.h	11 Mar 2005 00:24:54 -0000	1.35
@@ -42,6 +42,7 @@
 #include <mockpp/chaining/StubMatchersCollection.h>
 
 #include <mockpp/builder/StubBuilder.h>
+#include <mockpp/builder/BuilderNamespace.h>
 
 #include <mockpp/matcher/InvokedRecorder.h>
 #include <mockpp/matcher/InvokedAfterMatcher.h>
@@ -52,8 +53,29 @@
 namespace mockpp {
 
 
-class BuilderNamespace;
-class MatchBuilderAdapterBase;
+/** Base for a helper class for convenient handling of match builders.
+  * @internal
+  */
+class MatchBuilderAdapterBase
+{
+  public:
+
+  /** Returns the internal builder
+    * @return pointer to builder
+    */
+    virtual void *getBuilder() const = 0;
+
+  /** Destructs the adapter
+    */
+    virtual ~MatchBuilderAdapterBase()
+    {}
+
+  /** Adds another match to the builder
+    * @param    customMatcher   pointer to matcher object
+    */
+    virtual void match( TypelessMatcher::AP customMatcher ) = 0;
+};
+
 
 /** Builder class for matcher related purposes.
   * @ingroup grp_chainer
@@ -81,7 +103,7 @@
     */
     MatchBuilder<R, I>& after( const String &priorCallID )
     {
-      setupOrderingAfterMatchers( *getBuilderNamespace(), priorCallID, priorCallID );
+      this->setupOrderingAfterMatchers( *getBuilderNamespace(), priorCallID, priorCallID );
       return *this;
     }
 
@@ -92,7 +114,7 @@
     */
     MatchBuilder<R, I>& before( const String &subsequentCallID )
     {
-      setupOrderingBeforeMatchers( *getBuilderNamespace(), subsequentCallID, subsequentCallID );
+      this->setupOrderingBeforeMatchers( *getBuilderNamespace(), subsequentCallID, subsequentCallID );
       return *this;
     }
 
@@ -104,7 +126,7 @@
     */
     MatchBuilder<R, I>& after( BuilderNamespace &otherMock, const String &priorCallID )
     {
-      setupOrderingAfterMatchers( otherMock, priorCallID, priorCallID + MOCKPP_PCHAR( " on " ) + otherMock.getIdent() );
+      this->setupOrderingAfterMatchers( otherMock, priorCallID, priorCallID + MOCKPP_PCHAR( " on " ) + otherMock.getIdent() );
       return *this;
     }
 
@@ -116,7 +138,7 @@
     */
     MatchBuilder<R, I>& before( BuilderNamespace &otherMock, const String &subsequentCallID )
     {
-      setupOrderingBeforeMatchers( otherMock, subsequentCallID, subsequentCallID + MOCKPP_PCHAR( " on " ) + otherMock.getIdent() );
+      this->setupOrderingBeforeMatchers( otherMock, subsequentCallID, subsequentCallID + MOCKPP_PCHAR( " on " ) + otherMock.getIdent() );
       return *this;
     }
 
@@ -180,30 +202,6 @@
 };
 
 
-/** Base for a helper class for convenient handling of match builders.
-  * @internal
-  */
-class MatchBuilderAdapterBase
-{
-  public:
-
-  /** Returns the internal builder
-    * @return pointer to builder
-    */
-    virtual void *getBuilder() const = 0;
-
-  /** Destructs the adapter
-    */
-    virtual ~MatchBuilderAdapterBase()
-    {}
-
-  /** Adds another match to the builder
-    * @param    customMatcher   pointer to matcher object
-    */
-    virtual void match( TypelessMatcher::AP customMatcher ) = 0;
-};
-
-
 /** A helper class for convenient handling of match builders.
   * @internal
   */