lua-base4: Rename is to stream in loadStream()

diff --git a/pdns/lua-base4.cc b/pdns/lua-base4.cc
index 3984fe62e974583b2a7e8b6d85703d119ee0c3bc..19e6aef3384277e840675838be3166b598125caf 100644 (file)
--- a/pdns/lua-base4.cc
+++ b/pdns/lua-base4.cc
@@ -289,8 +289,8 @@ void BaseLua4::prepareContext() {
   d_lw->writeVariable("pdns", d_pd);
 }
 
-void BaseLua4::loadStream(std::istream &is) {
-  d_lw->executeCode(is);
+void BaseLua4::loadStream(std::istream &stream) {
+  d_lw->executeCode(stream);
 
   postLoad();
 }

diff --git a/pdns/lua-base4.hh b/pdns/lua-base4.hh
index 20b0159716bc93504d003209beccf1cb292395d5..1cf9e4b7c088efc5a61e428349fdb6ef518866c5 100644 (file)
--- a/pdns/lua-base4.hh
+++ b/pdns/lua-base4.hh
@@ -15,7 +15,7 @@ public:
   BaseLua4();
   void loadFile(const std::string& fname);
   void loadString(const std::string& script);
-  void loadStream(std::istream& is);
+  void loadStream(std::istream& stream);
   virtual ~BaseLua4(); // this is so unique_ptr works with an incomplete type
 protected:
   void prepareContext();