浏览代码

msvc9 error

David Rose 17 年之前
父节点
当前提交
2337616f94
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      dtool/src/dtoolbase/stl_compares.I

+ 3 - 1
dtool/src/dtoolbase/stl_compares.I

@@ -205,7 +205,9 @@ INLINE size_t sequence_hash<Key, Compare>::
 add_hash(size_t hash, const Key &key) {
 add_hash(size_t hash, const Key &key) {
 #ifdef _DEBUG
 #ifdef _DEBUG
   // We assume that the sequence is laid out sequentially in memory.
   // We assume that the sequence is laid out sequentially in memory.
-  assert(&(*key.end()) - &key[0] == key.size());
+  if (key.size() > 0) {
+    assert(&key[key.size() - 1] - &key[0] == key.size() - 1);
+  }
 #endif
 #endif
   size_t num_bytes = (key.size() * sizeof(key[0]));
   size_t num_bytes = (key.size() * sizeof(key[0]));
   return AddHash::add_hash(hash, (const PN_uint8 *)&key[0], num_bytes);
   return AddHash::add_hash(hash, (const PN_uint8 *)&key[0], num_bytes);