From e67ffd2e25b89017cbfac26052f7cdae28271a33 Mon Sep 17 00:00:00 2001
From: "cvshook%sicking.cc"
 <cvshook%sicking.cc@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 10 Nov 2006 23:29:55 +0000
Subject: [PATCH] Fix inconsistencies in colon at end of macro. rs=peterv. No
 bug

git-svn-id: svn://10.0.0.236/trunk@215127 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/xslt/src/xpath/txExpr.h       | 40 +++++++++----------
 .../src/xpath/txXPCOMExtensionFunction.cpp    |  2 +-
 .../xslt/src/xslt/txStylesheetCompiler.cpp    |  2 +-
 .../content/xslt/src/xslt/txXSLTFunctions.h   | 12 +++---
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/mozilla/content/xslt/src/xpath/txExpr.h b/mozilla/content/xslt/src/xpath/txExpr.h
index 43aa7b85e3d..4fa858ed933 100644
--- a/mozilla/content/xslt/src/xpath/txExpr.h
+++ b/mozilla/content/xslt/src/xpath/txExpr.h
@@ -182,17 +182,17 @@ public:
 #define TX_DECL_EXPR_BASE \
     nsresult evaluate(txIEvalContext* aContext, txAExprResult** aResult); \
     ResultType getReturnType(); \
-    PRBool isSensitiveTo(ContextSensitivity aContexts)
+    PRBool isSensitiveTo(ContextSensitivity aContexts);
 
 #define TX_DECL_EXPR \
-    TX_DECL_EXPR_BASE; \
+    TX_DECL_EXPR_BASE \
     TX_DECL_TOSTRING \
     Expr* getSubExprAt(PRUint32 aPos); \
-    void setSubExprAt(PRUint32 aPos, Expr* aExpr)
+    void setSubExprAt(PRUint32 aPos, Expr* aExpr);
 
 #define TX_DECL_OPTIMIZABLE_EXPR \
-    TX_DECL_EXPR; \
-    ExprType getType()
+    TX_DECL_EXPR \
+    ExprType getType();
     
 
 #define TX_DECL_FUNCTION \
@@ -395,7 +395,7 @@ public:
     {
     }
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
     static PRBool getTypeFromAtom(nsIAtom* aName, eType& aType);
 
@@ -619,7 +619,7 @@ public:
     {
     }
 
-    TX_DECL_OPTIMIZABLE_EXPR;
+    TX_DECL_OPTIMIZABLE_EXPR
 
     txNodeTest* getNodeTest()
     {
@@ -662,7 +662,7 @@ public:
     {
     }
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     nsAutoPtr<Expr> expr;
@@ -675,7 +675,7 @@ public:
     txLiteralExpr(double aDbl);
     txLiteralExpr(const nsAString& aStr);
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     nsRefPtr<txAExprResult> mValue;
@@ -703,7 +703,7 @@ public:
     {
     }
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     short op;
@@ -722,7 +722,7 @@ public:
     {
     }
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     nsAutoPtr<Expr> expr;
@@ -747,7 +747,7 @@ public:
     {
     }
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     nsAutoPtr<Expr> leftExpr, rightExpr;
@@ -777,7 +777,7 @@ public:
     {
     }
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     nsAutoPtr<Expr> mLeftExpr, mRightExpr;
@@ -815,7 +815,7 @@ public:
     }
 
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     PRBool compareResults(txIEvalContext* aContext, txAExprResult* aLeft,
@@ -836,7 +836,7 @@ public:
 
     VariableRefExpr(nsIAtom* aPrefix, nsIAtom* aLocalName, PRInt32 aNSID);
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     nsCOMPtr<nsIAtom> mPrefix;
@@ -870,7 +870,7 @@ public:
      */
     void deleteExprAt(PRUint32 aPos);
 
-    TX_DECL_OPTIMIZABLE_EXPR;
+    TX_DECL_OPTIMIZABLE_EXPR
 
     PathOperator getPathOpAt(PRUint32 aPos)
     {
@@ -916,7 +916,7 @@ public:
     {
     }
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 #ifdef TX_TO_STRING
 public:
@@ -962,7 +962,7 @@ public:
      */
     void deleteExprAt(PRUint32 aPos);
 
-    TX_DECL_OPTIMIZABLE_EXPR;
+    TX_DECL_OPTIMIZABLE_EXPR
 
 private:
 
@@ -980,7 +980,7 @@ public:
     txNamedAttributeStep(PRInt32 aNsID, nsIAtom* aPrefix,
                          nsIAtom* aLocalName);
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 private:
     PRInt32 mNamespace;
@@ -1017,7 +1017,7 @@ public:
     }
 #endif
 
-    TX_DECL_EXPR;
+    TX_DECL_EXPR
 
 #ifdef TX_TO_STRING
 private:
diff --git a/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp b/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
index 60822c2e8f8..566b3097fd4 100644
--- a/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
+++ b/mozilla/content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
@@ -132,7 +132,7 @@ public:
 #endif
                                   nsISupports *aState);
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
 private:
     txArgumentType GetParamType(const nsXPTParamInfo &aParam,
diff --git a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
index a6ed94916b2..ae78f9f3a25 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
@@ -896,7 +896,7 @@ public:
     {
     }
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
 private:
     nsCOMPtr<nsIAtom> mName;
diff --git a/mozilla/content/xslt/src/xslt/txXSLTFunctions.h b/mozilla/content/xslt/src/xslt/txXSLTFunctions.h
index b5b5d3fee6c..7f95457df96 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTFunctions.h
+++ b/mozilla/content/xslt/src/xslt/txXSLTFunctions.h
@@ -60,7 +60,7 @@ public:
     **/
     DocumentFunctionCall(const nsAString& aBaseURI);
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
 private:
     nsString mBaseURI;
@@ -78,7 +78,7 @@ public:
      */
     txKeyFunctionCall(txNamespaceMap* aMappings);
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
 private:
     nsRefPtr<txNamespaceMap> mMappings;
@@ -96,7 +96,7 @@ public:
     **/
     txFormatNumberFunctionCall(txStylesheet* aStylesheet, txNamespaceMap* aMappings);
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
 private:
     static const PRUnichar FORMAT_QUOTE;
@@ -153,7 +153,7 @@ public:
     **/
     CurrentFunctionCall();
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 };
 
 /**
@@ -168,7 +168,7 @@ public:
     **/
     GenerateIdFunctionCall();
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 };
 
 
@@ -186,7 +186,7 @@ public:
     {
     }
 
-    TX_DECL_FUNCTION;
+    TX_DECL_FUNCTION
 
 private:
     eType mType;