From 2ff956c605561d70a3e9a2748ab44b259234eb7f Mon Sep 17 00:00:00 2001
From: David Reiss <dreiss@apache.org>
Date: Thu, 21 May 2009 02:28:23 +0000
Subject: [PATCH] cpp: Fix an OpenBSD compilation bug by moving a typedef

The typedef was aliasing a private type, which is apparently illegal.
Moving it into the class definition fixed it.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@776928 13f79535-47bb-0310-9956-ffa450edef68
---
 lib/cpp/src/concurrency/TimerManager.cpp | 3 ---
 lib/cpp/src/concurrency/TimerManager.h   | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/cpp/src/concurrency/TimerManager.cpp b/lib/cpp/src/concurrency/TimerManager.cpp
index 25515dc8..861a62f5 100644
--- a/lib/cpp/src/concurrency/TimerManager.cpp
+++ b/lib/cpp/src/concurrency/TimerManager.cpp
@@ -29,9 +29,6 @@ namespace apache { namespace thrift { namespace concurrency {
 
 using boost::shared_ptr;
 
-typedef std::multimap<int64_t, shared_ptr<TimerManager::Task> >::iterator task_iterator;
-typedef std::pair<task_iterator, task_iterator> task_range;
-
 /**
  * TimerManager class
  *
diff --git a/lib/cpp/src/concurrency/TimerManager.h b/lib/cpp/src/concurrency/TimerManager.h
index f3f799f9..dfbf0ea4 100644
--- a/lib/cpp/src/concurrency/TimerManager.h
+++ b/lib/cpp/src/concurrency/TimerManager.h
@@ -113,6 +113,8 @@ class TimerManager {
   friend class Dispatcher;
   boost::shared_ptr<Dispatcher> dispatcher_;
   boost::shared_ptr<Thread> dispatcherThread_;
+  typedef std::multimap<int64_t, boost::shared_ptr<TimerManager::Task> >::iterator task_iterator;
+  typedef std::pair<task_iterator, task_iterator> task_range;
 };
 
 }}} // apache::thrift::concurrency
-- 
2.17.1