Make the Callback templates more generic.

Instead of unconditionally adding const& to the specified types, require
the user of the Callback templates to specify it. This makes it possible
to use these same templates also for other types.

Now, const int& is replaced with just plain int. Later, this will be
used to replace const std::string& with std::string*.

R=rouslan@chromium.org

2 files changed, 4 insertions, 2 deletions

diff --git a/cpp/src/retriever.h b/cpp/src/retriever.h
index f3f7e18..17d17ec 100644
--- a/cpp/src/retriever.h
+++ b/cpp/src/retriever.h
@@ -42,7 +42,8 @@ class ValidatingStorage;
 //    retriever.Retrieve("data/CA/AB--fr", *retrieved);
 class Retriever {
  public:
-  typedef i18n::addressinput::Callback<std::string, std::string> Callback;
+  typedef i18n::addressinput::Callback<const std::string&,
+                                       const std::string&> Callback;
 
   // Takes ownership of |downloader| and |storage|.
   Retriever(const std::string& validation_data_url,
diff --git a/cpp/src/rule_retriever.h b/cpp/src/rule_retriever.h
index a44fb63..ba3b4c7 100644
--- a/cpp/src/rule_retriever.h
+++ b/cpp/src/rule_retriever.h
@@ -37,7 +37,8 @@ class Rule;
 //    rules.RetrieveRule("data/CA/AB--fr", *rule_ready);
 class RuleRetriever {
  public:
-  typedef i18n::addressinput::Callback<std::string, Rule> Callback;
+  typedef i18n::addressinput::Callback<const std::string&,
+                                       const Rule&> Callback;
 
   // Takes ownership of |retriever|.
   explicit RuleRetriever(const Retriever* retriever);