BIND 10 master, updated. b41d5a89cc84139a08dc48de7ac08bf602d1c580 Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  b41d5a89cc84139a08dc48de7ac08bf602d1c580 (commit)
       via  43b5b823592d258002b741a5f88f9c3f60783c8a (commit)
       via  c5a9c69b1e925a9f3846f65f64f7f61077e44d3a (commit)
      from  3c89c290c7296591b773caf0c1a626bba40eb588 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b41d5a89cc84139a08dc48de7ac08bf602d1c580
Merge: 43b5b823592d258002b741a5f88f9c3f60783c8a 3c89c290c7296591b773caf0c1a626bba40eb588
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Mar 23 17:18:54 2012 +0530

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 43b5b823592d258002b741a5f88f9c3f60783c8a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 22 19:22:35 2012 +0530

    [master] Change log file maxsize setting in the BIND 10 guide example

commit c5a9c69b1e925a9f3846f65f64f7f61077e44d3a
Author: Vaclav Haisman <wilx at users.sourceforge.net>
Date:   Thu Mar 22 19:04:51 2012 +0530

    bug #1825: Don't use log4cplus macros which are going to be obsolete soon
    
    LOG4CPLUS_OPEN_MODE_TYPE and LOG4CPLUS_FSTREAM_NAMESPACE are going to be
    removed in log4cplus 1.1.0 according to the bug report.

-----------------------------------------------------------------------

Summary of changes:
 doc/guide/bind10-guide.xml         |    4 ++--
 src/lib/log/logger_manager_impl.cc |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index 6a68f82..3599e25 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -2865,7 +2865,7 @@ Logging/loggers[0]/output_options[0]/maxver	0	integer	(default)
 
           <screen>> <userinput> config set Logging/loggers[0]/output_options[0]/destination file</userinput>
 > <userinput> config set Logging/loggers[0]/output_options[0]/output /var/log/bind10.log</userinput>
-> <userinput> config set Logging/loggers[0]/output_options[0]/maxsize 30000</userinput>
+> <userinput> config set Logging/loggers[0]/output_options[0]/maxsize 204800</userinput>
 > <userinput> config set Logging/loggers[0]/output_options[0]/maxver 8</userinput>
 </screen>
 
@@ -2888,7 +2888,7 @@ Logging/loggers[0]/additive	false	boolean	(default)
 Logging/loggers[0]/output_options[0]/destination	"file"	string	(modified)
 Logging/loggers[0]/output_options[0]/output	"/var/log/bind10.log"	string	(modified)
 Logging/loggers[0]/output_options[0]/flush	false	boolean	(default)
-Logging/loggers[0]/output_options[0]/maxsize	30000	integer	(modified)
+Logging/loggers[0]/output_options[0]/maxsize	204800	integer	(modified)
 Logging/loggers[0]/output_options[0]/maxver	8	integer	(modified)
 </screen>
 
diff --git a/src/lib/log/logger_manager_impl.cc b/src/lib/log/logger_manager_impl.cc
index d69cec8..68f2bb8 100644
--- a/src/lib/log/logger_manager_impl.cc
+++ b/src/lib/log/logger_manager_impl.cc
@@ -115,8 +115,8 @@ void
 LoggerManagerImpl::createFileAppender(log4cplus::Logger& logger,
                                          const OutputOption& opt)
 {
-    LOG4CPLUS_OPEN_MODE_TYPE mode = 
-        LOG4CPLUS_FSTREAM_NAMESPACE::ios::app;  // Append to existing file
+    // Append to existing file
+    std::ios::openmode mode = std::ios::app;
 
     log4cplus::SharedAppenderPtr fileapp;
     if (opt.maxsize == 0) {