dbertoni 2003/02/12 18:46:04
Modified: c/samples/ExternalFunction ExternalFunction.cpp
Log:
Moved using declaration after function declarations.
Revision Changes Path
1.29 +12 -12 xml-xalan/c/samples/ExternalFunction/ExternalFunction.cpp
Index: ExternalFunction.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/samples/ExternalFunction/ExternalFunction.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ExternalFunction.cpp 13 Feb 2003 01:26:41 -0000 1.28
+++ ExternalFunction.cpp 13 Feb 2003 02:46:04 -0000 1.29
@@ -41,10 +41,6 @@
{
public:
-#if !defined(XALAN_NO_USING_DECLARATION)
- using Function::execute;
-#endif
-
/**
* Execute an XPath function object. The function must return a valid
* object. Extension functions should override this version of
execute(),
@@ -78,6 +74,10 @@
return
executionContext.getXObjectFactory().createNumber(sqrt(args[0]->num()));
}
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using Function::execute;
+#endif
+
/**
* Create a copy of the function object.
*
@@ -126,10 +126,6 @@
{
public:
-#if !defined(XALAN_NO_USING_DECLARATION)
- using Function::execute;
-#endif
-
/**
* Execute an XPath function object. The function must return a valid
* object. Extension functions should override this version of
execute(),
@@ -163,6 +159,10 @@
return
executionContext.getXObjectFactory().createNumber(pow(args[0]->num(), 3));
}
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using Function::execute;
+#endif
+
/**
* Create a copy of the function object.
*
@@ -211,10 +211,6 @@
{
public:
-#if !defined(XALAN_NO_USING_DECLARATION)
- using Function::execute;
-#endif
-
/**
* Execute an XPath function object. The function must return a valid
* object. Extension functions should override this version of
execute(),
@@ -260,6 +256,10 @@
return
executionContext.getXObjectFactory().createString(XalanDOMString(theTimeString));
}
+
+#if !defined(XALAN_NO_USING_DECLARATION)
+ using Function::execute;
+#endif
/**
* Create a copy of the function object.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
