diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-12 16:30:02 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-11-12 16:30:02 +0400 |
| commit | 6b65102c20e9bdafd90f55f60c2a2084d873e809 (patch) | |
| tree | a0f5554702501d2da1073b22ff55f740aff135f9 /intern/audaspace/FX/AUD_SuperposeFactory.h | |
| parent | 053710fcbc78ff83b9617be87558876e381f85a6 (diff) | |
| parent | 83de5cb30831328548502126dff84ffdb72544f2 (diff) | |
Merge w/ trunk: r51141-52085 (Important Note: gameengine and blenderplayer were not merged due to complex differences)
Diffstat (limited to 'intern/audaspace/FX/AUD_SuperposeFactory.h')
| -rw-r--r-- | intern/audaspace/FX/AUD_SuperposeFactory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/audaspace/FX/AUD_SuperposeFactory.h b/intern/audaspace/FX/AUD_SuperposeFactory.h index 2da8e34496d..caa0dfb752f 100644 --- a/intern/audaspace/FX/AUD_SuperposeFactory.h +++ b/intern/audaspace/FX/AUD_SuperposeFactory.h @@ -43,12 +43,12 @@ private: /** * First played factory. */ - AUD_Reference<AUD_IFactory> m_factory1; + boost::shared_ptr<AUD_IFactory> m_factory1; /** * Second played factory. */ - AUD_Reference<AUD_IFactory> m_factory2; + boost::shared_ptr<AUD_IFactory> m_factory2; // hide copy constructor and operator= AUD_SuperposeFactory(const AUD_SuperposeFactory&); @@ -60,9 +60,9 @@ public: * \param factory1 The first input factory. * \param factory2 The second input factory. */ - AUD_SuperposeFactory(AUD_Reference<AUD_IFactory> factory1, AUD_Reference<AUD_IFactory> factory2); + AUD_SuperposeFactory(boost::shared_ptr<AUD_IFactory> factory1, boost::shared_ptr<AUD_IFactory> factory2); - virtual AUD_Reference<AUD_IReader> createReader(); + virtual boost::shared_ptr<AUD_IReader> createReader(); }; #endif //__AUD_SUPERPOSEFACTORY_H__ |