From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 10 Jul 2007 19:03:34 +0000 (+0000)
Subject: Added explicit template argument for use of std::min with argument types unsigned... 
X-Git-Tag: 1.2.1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9b315c3736f832efaa168ec9cc3c437bcc6c2830;p=videolink.git

Added explicit template argument for use of std::min with argument types unsigned and std::size_t.
---

diff --git a/ChangeLog b/ChangeLog
index c85518b..26d2dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+videolink (1.2.1) unstable; urgency=medium
+
+  * Fixed build failure on 64-bit architectures
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 10 Jul 2007 19:59:17 +0100
+
 videolink (1.2) unstable; urgency=low
 
   * Removed support for Mozilla 1.7
diff --git a/debian/changelog b/debian/changelog
index ee97b76..2b58e03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+videolink (1.2.1-1) unstable; urgency=low
+
+  * New upstream version - closes: #432403
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Tue, 10 Jul 2007 19:59:54 +0100
+
 videolink (1.2-1) unstable; urgency=low
 
   * New upstream version - closes: #393201, #428180, #432054
diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index 1d43a9a..d5185c2 100644
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -376,8 +376,9 @@ void dvd_generator::generate(const std::string & output_dir) const
 	const unsigned menu_begin = titleset_num * dvdauthor_anonymous_menus_max;
 	const unsigned menu_end =
 	    have_real_menus
-	    ? std::min((titleset_num + 1) * dvdauthor_anonymous_menus_max,
-		       menus_.size())
+	    ? std::min<unsigned>(
+		(titleset_num + 1) * dvdauthor_anonymous_menus_max,
+		menus_.size())
 	    : menu_begin + 1;
 
 	for (unsigned menu_index = menu_begin;