[Firebird-checkins] SF.net SVN: firebird:[62073] firebird/trunk/src/jrd/validation.h

[<hv...@us...>]

Revision: 62073
          http://sourceforge.net/p/firebird/code/62073
Author:   hvlad
Date:     2015-08-02 19:00:21 +0000 (Sun, 02 Aug 2015)
Log Message:
-----------
1. I see no reason to use explicit constructor in this case. More, it breaks build.
2. One more paranoid check by Claudio :)

Modified Paths:
--------------
    firebird/trunk/src/jrd/validation.h

Modified: firebird/trunk/src/jrd/validation.h
===================================================================
--- firebird/trunk/src/jrd/validation.h	2015-08-02 15:51:01 UTC (rev 62072)
+++ firebird/trunk/src/jrd/validation.h	2015-08-02 19:00:21 UTC (rev 62073)
@@ -160,14 +160,14 @@
 	struct UsedBdb
 	{
 		UsedBdb() : bdb(NULL), count(0) {}
-		explicit UsedBdb(BufferDesc* _bdb) : bdb(_bdb), count(1) {}
+		UsedBdb(BufferDesc* _bdb) : bdb(_bdb), count(1) {}
 
 		BufferDesc* bdb;
 		int count;
 
 		static const ULONG generate(const UsedBdb& p)
 		{
-			return p.bdb->bdb_page.getPageNum();
+			return p.bdb ? p.bdb->bdb_page.getPageNum() : 0;
 		}
 	};
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.