BIND 10 master, updated. 71be4dc12e4ffee2641ea54f70bd26f16bdc1460 Merge branch 'master' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  71be4dc12e4ffee2641ea54f70bd26f16bdc1460 (commit)
       via  673bbeb9b8b1ecd0629c0807578624705c58085b (commit)
      from  fc4e4e5c2c469c8c464146bfe56cda99effd4593 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 71be4dc12e4ffee2641ea54f70bd26f16bdc1460
Merge: 673bbeb fc4e4e5
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri May 3 09:57:22 2013 +0200

    Merge branch 'master' of git+ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 673bbeb9b8b1ecd0629c0807578624705c58085b
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Fri May 3 09:53:07 2013 +0200

    Don't rely on friends
    
    Fix compilation on SunStudio. Avoid relying on combination of friend
    declaration and nested class, which SunStudio gets wrong as it's quite
    complex.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/resolver/bench/fake_resolution.cc |    2 +-
 src/bin/resolver/bench/fake_resolution.h  |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/bench/fake_resolution.cc b/src/bin/resolver/bench/fake_resolution.cc
index c08e45a..7587e6e 100644
--- a/src/bin/resolver/bench/fake_resolution.cc
+++ b/src/bin/resolver/bench/fake_resolution.cc
@@ -144,7 +144,7 @@ public:
         timer_(timer)
     {}
     void trigger() {
-        query_->outstanding_ = false;
+        query_->answerReceived();
         callback_();
         // We are not needed any more.
         delete this;
diff --git a/src/bin/resolver/bench/fake_resolution.h b/src/bin/resolver/bench/fake_resolution.h
index c2011d3..cf2219c 100644
--- a/src/bin/resolver/bench/fake_resolution.h
+++ b/src/bin/resolver/bench/fake_resolution.h
@@ -142,6 +142,13 @@ public:
         }
         interface_ = &dst_interface;
     }
+    /// \brief The answer for upstream query was received
+    ///
+    /// This should be called from within the FakeInterface only.
+    /// It marks that the query from upstream was answered.
+    void answerReceived() {
+        outstanding_ = false;
+    }
 private:
     // The scheduled steps for this task.
     typedef std::pair<Task, size_t> Step;