Parcourir la source

[1331] don't try to initialize an array from an array (not sure whether
there's even any compiler that allows it, but at least it shouldn't
be portable if not illegal.)

JINMEI Tatuya il y a 13 ans
Parent
commit
6da32eaece
1 fichiers modifiés avec 8 ajouts et 2 suppressions
  1. 8 2
      src/lib/datasrc/tests/database_unittest.cc

+ 8 - 2
src/lib/datasrc/tests/database_unittest.cc

@@ -277,8 +277,14 @@ struct JournalEntry {
     JournalEntry(int id, uint32_t serial,
                  DatabaseAccessor::DiffOperation operation,
                  const std::string (&data)[DatabaseAccessor::DIFF_PARAM_COUNT])
-        : id_(id), serial_(serial), operation_(operation), data_(data)
-    {}
+        : id_(id), serial_(serial), operation_(operation)
+    {
+        data_[DatabaseAccessor::DIFF_NAME] = data[DatabaseAccessor::DIFF_NAME];
+        data_[DatabaseAccessor::DIFF_TYPE] = data[DatabaseAccessor::DIFF_TYPE];
+        data_[DatabaseAccessor::DIFF_TTL] = data[DatabaseAccessor::DIFF_TTL];
+        data_[DatabaseAccessor::DIFF_RDATA] =
+            data[DatabaseAccessor::DIFF_RDATA];
+    }
     JournalEntry(int id, uint32_t serial,
                  DatabaseAccessor::DiffOperation operation,
                  const std::string& name, const std::string& type,