Author: dreiss
Date: Thu May 21 02:28:23 2009
New Revision: 776928
URL: http://svn.apache.org/viewvc?rev=776928&view=rev
Log:
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.
Modified:
incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp
incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.h
Modified: incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp?rev=776928&r1=776927&r2=776928&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp (original)
+++ incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.cpp Thu May 21
02:28:23 2009
@@ -29,9 +29,6 @@
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
*
Modified: incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.h
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.h?rev=776928&r1=776927&r2=776928&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/concurrency/TimerManager.h Thu May 21
02:28:23 2009
@@ -113,6 +113,8 @@
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
