Address import warnings

src/Ros/Internal/DepFinder.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -- Use a package's manifest.xml file to find paths to the packages on
 -- which this package is dependent.
 module Ros.Internal.DepFinder (findPackageDeps, findPackageDepNames,
@@ -6,7 +7,9 @@ module Ros.Internal.DepFinder (findPackageDeps, findPackageDepNames,
                                findDepsWithMessages, hasMsgsOrSrvs,
                                findServices
                               ) where
+#if __GLASGOW_HASKELL__ < 710                              
 import Control.Applicative ((<$>))
+#endif
 import Control.Monad (when, filterM)
 import Data.Maybe (mapMaybe, isJust, catMaybes)
 import Data.List (find, nub)

src/Ros/Internal/SetupUtil.hs

@@ -1,7 +1,9 @@
-{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE CPP, TupleSections #-}
 -- |Integration with the Cabal build system.
 module Ros.Internal.SetupUtil (rosBuild, rosConf) where
+#if __GLASGOW_HASKELL__ < 710
 import Control.Applicative
+#endif
 import Data.List (intercalate)
 import Distribution.Simple
 import Distribution.Simple.InstallDirs

src/Ros/Node/ConnectionHeader.hs

@@ -1,9 +1,12 @@
+{-# LANGUAGE CPP #-}
 -- |The ROS connection header contains important metadata about a
 -- connection being established, including typing information and
 -- routing information. How it is exchanged depends on the ROS
 -- transport being used.
 module Ros.Node.ConnectionHeader (genHeader, ConnHeader(..), parseHeader) where
+#if __GLASGOW_HASKELL__ < 710
 import Control.Applicative ((<$>))
+#endif
 import Control.Arrow (second, (***))
 import Data.Binary.Get (getWord32le, Get, getByteString, runGetIncremental)
 import qualified Data.Binary.Get as G

src/Ros/Topic.hs

@@ -6,10 +6,9 @@
 -- using either qualification (e.g. @import qualified Ros.TopicUtil as
 -- T@), an explicit import list, or a @hiding@ clause.
 module Ros.Topic where
-#if __GLASGOW_HASKELL__ >= 710
-import Prelude hiding (join)
-#endif
+#if __GLASGOW_HASKELL__ < 710
 import Control.Applicative
+#endif
 import Control.Arrow ((***), second)
 import Control.Monad ((<=<), (>=>))
 import Control.Monad.IO.Class