Reversed the effect of an earlier patch (to put timers back in the C++ backend) now that I've seen Adam's patch that fixes it anyway

backends/GenerateC.hs

@@ -17,7 +17,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 -}
 
 -- | Generate C code from the mangled AST.
-module GenerateC (cgenOps, cgenDeclaration, cgenType, cintroduceSpec, cPreReq, genComma, genCPasses, generate, generateC, genLeftB, genMeta, genName, genRightB, seqComma, withIf ) where
+module GenerateC (cgenOps, cgenType, cintroduceSpec, cPreReq, genComma, genCPasses, generate, generateC, genLeftB, genMeta, genName, genRightB, seqComma, withIf ) where
 
 import Data.Char
 import Data.Generics

backends/GenerateCPPCSP.hs

@@ -39,7 +39,7 @@ import System.IO
 
 import qualified AST as A
 import CompState
-import GenerateC (cgenDeclaration, cgenOps, cintroduceSpec, cgenType, generate, genComma, genLeftB, genMeta, genName, genRightB, seqComma, withIf)
+import GenerateC (cgenOps, cintroduceSpec, cgenType, generate, genComma, genLeftB, genMeta, genName, genRightB, seqComma, withIf)
 import GenerateCBased
 import Metadata
 import Pass
@@ -60,7 +60,6 @@ cppgenOps = cgenOps {
     genAllocMobile = cppgenAllocMobile,
     genAlt = cppgenAlt,
     genClearMobile = cppgenClearMobile,
-    genDeclaration = cppgenDeclaration,
     genDirectedVariable = cppgenDirectedVariable,
     genForwardDeclaration = cppgenForwardDeclaration,
     genGetTime = cppgenGetTime,
@@ -472,14 +471,6 @@ cppgenProcCall n as
          call genActuals as
          tell [");"]
 
-cppgenDeclaration :: A.Type -> A.Name -> Bool -> CGen ()
-cppgenDeclaration A.Timer n _
-    =  do call genType A.Timer
-          tell [" "]
-          genName n
-          tell [";"]
-cppgenDeclaration t n b = cgenDeclaration t n b
-
 -- | Changed because we initialise channels and arrays differently in C++
 cppdeclareInit :: Meta -> A.Type -> A.Variable -> Maybe (CGen ())
 cppdeclareInit m t@(A.Array ds t') var