Browse Source

[1704] style matters: fold long lines, explicit virtual for inherited methods.

JINMEI Tatuya 13 years ago
parent
commit
088760558f

+ 2 - 1
src/bin/bind10/tests/bind10_test.py.in

@@ -1471,7 +1471,8 @@ class SocketSrvTest(unittest.TestCase):
 
 class TestFunctions(unittest.TestCase):
     def setUp(self):
-        self.lockfile_testpath = "@abs_top_builddir@/src/bin/bind10/tests/lockfile_test"
+        self.lockfile_testpath = \
+            "@abs_top_builddir@/src/bin/bind10/tests/lockfile_test"
         self.assertFalse(os.path.exists(self.lockfile_testpath))
         os.mkdir(self.lockfile_testpath)
         self.assertTrue(os.path.isdir(self.lockfile_testpath))

+ 2 - 1
src/lib/log/logger_impl.cc

@@ -112,7 +112,8 @@ LoggerImpl::lookupMessage(const MessageID& ident) {
 void
 LoggerImpl::setInterprocessSync(isc::util::InterprocessSync* sync) {
     if (sync == NULL) {
-        isc_throw(BadInterprocessSync, "NULL was passed to setInterprocessSync()");
+        isc_throw(BadInterprocessSync,
+                  "NULL was passed to setInterprocessSync()");
     }
 
     delete sync_;

+ 3 - 3
src/lib/log/tests/logger_lock_test.cc

@@ -30,17 +30,17 @@ public:
     {}
 
 protected:
-    bool lock() {
+    virtual bool lock() {
         cout << "FIELD1 FIELD2 LOGGER_LOCK_TEST: LOCK\n";
         return (true);
     }
 
-    bool tryLock() {
+    virtual bool tryLock() {
         cout << "FIELD1 FIELD2 LOGGER_LOCK_TEST: TRYLOCK\n";
         return (true);
     }
 
-    bool unlock() {
+    virtual bool unlock() {
         cout << "FIELD1 FIELD2 LOGGER_LOCK_TEST: UNLOCK\n";
         return (true);
     }