From 12f96b565376a5e78332f0b60e064cf880966ca9 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Mon, 7 Dec 2009 13:23:38 +0000
Subject: [PATCH] Merge warning fixes from Trunk.

[SVN r58217]
---
 static_assert_example_2.cpp | 2 +-
 static_assert_example_3.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static_assert_example_2.cpp b/static_assert_example_2.cpp
index 039c602..a32b79d 100644
--- a/static_assert_example_2.cpp
+++ b/static_assert_example_2.cpp
@@ -12,7 +12,7 @@
 #include <boost/type_traits.hpp>
 
 template <class RandomAccessIterator >
-RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator to)
+RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator /*to*/)
 {
    // this template can only be used with
    // random access iterators...
diff --git a/static_assert_example_3.cpp b/static_assert_example_3.cpp
index e958131..1cc1545 100644
--- a/static_assert_example_3.cpp
+++ b/static_assert_example_3.cpp
@@ -5,7 +5,7 @@
 
 //  See http://www.boost.org for most recent version including documentation.
 
-#include <climits>
+#include <limits>
 #include <boost/limits.hpp>
 #include <boost/static_assert.hpp>