* Fixed compilation problems in gcc.

diff --git a/core/frame/frame.h b/core/frame/frame.h
index 8e680d849634e226eb56573e8873277c60252afd..a53183faff2ca1c225123ee14f1e7951cb621167 100644 (file)
--- a/core/frame/frame.h
+++ b/core/frame/frame.h
@@ -46,7 +46,7 @@ public:
                        
        // Properties
                        
-       const pixel_format_desc& pixel_format_desc() const;
+       const core::pixel_format_desc& pixel_format_desc() const;
 
        const array<std::uint8_t>& image_data(std::size_t index = 0) const;
        const core::audio_buffer& audio_data() const;
@@ -95,7 +95,7 @@ public:
                                
        // Properties
                                
-       const pixel_format_desc& pixel_format_desc() const;
+       const core::pixel_format_desc& pixel_format_desc() const;
 
        array<const std::uint8_t> image_data(int index = 0) const;
        const core::audio_buffer& audio_data() const;
@@ -120,4 +120,4 @@ private:
        spl::shared_ptr<impl> impl_;
 };
 
-}}
\ No newline at end of file
+}}

diff --git a/core/producer/scene/scene_cg_proxy.h b/core/producer/scene/scene_cg_proxy.h
index 527372c3973020b447299248075774a1aee1a3c5..9c4b650c167198eb84b07386ac317d640c652370 100644 (file)
--- a/core/producer/scene/scene_cg_proxy.h
+++ b/core/producer/scene/scene_cg_proxy.h
@@ -42,7 +42,7 @@ public:
        std::wstring template_host_info() override;
 private:
        struct impl;
-       spl::unique_ptr<impl> impl_;
+       spl::shared_ptr<impl> impl_;
 };
 
 }}}

diff --git a/core/producer/scene/scene_producer.cpp b/core/producer/scene/scene_producer.cpp
index 1cd0a0e7ebba76f85738e09de6e893eef1daa10c..7635dd305fa7ff64db58be66ddf70a72c105efce 100644 (file)
--- a/core/producer/scene/scene_producer.cpp
+++ b/core/producer/scene/scene_producer.cpp
@@ -259,7 +259,7 @@ struct scene_producer::impl
                        auto action = iter->second.action;
 
                        if (action == mark_action::stop || action == mark_action::jump_to || action == mark_action::remove)
-                               return *iter;
+                               return std::make_pair(iter->first, iter->second);
                }
 
                return boost::none;
@@ -277,7 +277,7 @@ struct scene_producer::impl
                        auto action = iter->second.action;
 
                        if (action == mark_action::start)
-                               return *iter;
+                               return std::make_pair(iter->first, iter->second);
                }
 
                return boost::none;