Import utils::packageVersion

artemklevtsov · Aug 3, 2015 · 6aeca57 · 6aeca57
1 parent b15984f
commit 6aeca57
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 13 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,8 @@ Depends:
     R (>= 2.15.1),
     methods
 Imports:
-    Rcpp (>= 0.11.0)
+    Rcpp (>= 0.11.0),
+    utils
 LinkingTo: Rcpp
 URL: https://github.com/rstudio/httpuv
 SystemRequirements: GNU make
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.0.2): do not edit by hand
+# Generated by roxygen2 (4.1.1): do not edit by hand
 
 export(decodeURI)
 export(decodeURIComponent)
@@ -16,4 +16,5 @@ export(stopServer)
 exportClasses(WebSocket)
 import(methods)
 importFrom(Rcpp,evalCpp)
+importFrom(utils,packageVersion)
 useDynLib(httpuv)
diff --git a/R/httpuv.R b/R/httpuv.R
@@ -25,6 +25,7 @@
 #' @useDynLib httpuv
 #' @import methods
 #' @importFrom Rcpp evalCpp
+#' @importFrom utils packageVersion
 NULL
 
 # Implementation of Rook input stream

diff --git a/man/WebSocket-class.Rd b/man/WebSocket-class.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \docType{class}
 \name{WebSocket-class}
 \alias{WebSocket}

diff --git a/man/encodeURI.Rd b/man/encodeURI.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/RcppExports.R
 \name{encodeURI}
 \alias{decodeURI}
 \alias{decodeURIComponent}

diff --git a/man/httpuv-package.Rd b/man/httpuv-package.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \docType{package}
 \name{httpuv-package}
 \alias{httpuv}

diff --git a/man/interrupt.Rd b/man/interrupt.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{interrupt}
 \alias{interrupt}
 \title{Interrupt httpuv runloop}

diff --git a/man/rawToBase64.Rd b/man/rawToBase64.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{rawToBase64}
 \alias{rawToBase64}
 \title{Convert raw vector to Base64-encoded string}

diff --git a/man/runServer.Rd b/man/runServer.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{runServer}
 \alias{runServer}
 \title{Run a server}

diff --git a/man/service.Rd b/man/service.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{service}
 \alias{service}
 \title{Process requests}

diff --git a/man/startDaemonizedServer.Rd b/man/startDaemonizedServer.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{startDaemonizedServer}
 \alias{startDaemonizedServer}
 \title{Create an HTTP/WebSocket daemonized server (experimental)}

diff --git a/man/startServer.Rd b/man/startServer.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{startServer}
 \alias{startPipeServer}
 \alias{startServer}

diff --git a/man/stopDaemonizedServer.Rd b/man/stopDaemonizedServer.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{stopDaemonizedServer}
 \alias{stopDaemonizedServer}
 \title{Stop a running daemonized server in Unix environments}

diff --git a/man/stopServer.Rd b/man/stopServer.Rd
@@ -1,4 +1,5 @@
-% Generated by roxygen2 (4.0.2): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/httpuv.R
 \name{stopServer}
 \alias{stopServer}
 \title{Stop a running server}