From d9cc1a6986188a97e09e4c8cef46c34eee5f9cd2 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Sun, 10 Nov 2013 00:58:44 -0500
Subject: guard against direct includes of tr1

---
 training/utils/online_optimizer.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'training/utils/online_optimizer.h')

diff --git a/training/utils/online_optimizer.h b/training/utils/online_optimizer.h
index 28d89344..19223e9d 100644
--- a/training/utils/online_optimizer.h
+++ b/training/utils/online_optimizer.h
@@ -1,10 +1,10 @@
 #ifndef _ONL_OPTIMIZE_H_
 #define _ONL_OPTIMIZE_H_
 
-#include <tr1/memory>
 #include <set>
 #include <string>
 #include <cmath>
+#include <boost/shared_ptr.hpp>
 #include "sparse_vector.h"
 
 struct LearningRateSchedule {
@@ -56,7 +56,7 @@ struct ExponentialDecayLearningRate : public LearningRateSchedule {
 class OnlineOptimizer {
  public:
   virtual ~OnlineOptimizer();
-  OnlineOptimizer(const std::tr1::shared_ptr<LearningRateSchedule>& s,
+  OnlineOptimizer(const boost::shared_ptr<LearningRateSchedule>& s,
                   size_t batch_size,
                   const std::vector<int>& frozen_feats = std::vector<int>())
       : N_(batch_size),schedule_(s),k_() {
@@ -77,13 +77,13 @@ class OnlineOptimizer {
   std::set<int> frozen_;  // frozen (non-optimizing) features
 
  private:
-  std::tr1::shared_ptr<LearningRateSchedule> schedule_;
+  boost::shared_ptr<LearningRateSchedule> schedule_;
   int k_;  // iteration count
 };
 
 class CumulativeL1OnlineOptimizer : public OnlineOptimizer {
  public:
-  CumulativeL1OnlineOptimizer(const std::tr1::shared_ptr<LearningRateSchedule>& s,
+  CumulativeL1OnlineOptimizer(const boost::shared_ptr<LearningRateSchedule>& s,
                               size_t training_instances, double C,
                               const std::vector<int>& frozen) :
     OnlineOptimizer(s, training_instances, frozen), C_(C), u_() {}
-- 
cgit v1.2.3