Write timestamp, thread and severity on each line in a multiline log statement, not...

[casparcg] / common / tweener.h

diff --git a/common/tweener.h b/common/tweener.h
index 3747cfce719aae0ef8398672e9854575b645d720..3a842a36b3401f671b819895f7072b2b8462f0ab 100644 (file)
--- a/common/tweener.h
+++ b/common/tweener.h
@@ -24,7 +24,7 @@
 #include <functional>
 #include <vector>
 
-namespace caspar { namespace core {
+namespace caspar {
 
 /**
  * A tweener can be used for creating any kind of (image position, image fade
@@ -53,7 +53,7 @@ public:
         * @return The possible tween function names. Some of them may also support
         *                 additional parameters appended to the name.
         */
-       static const std::vector<const std::wstring>& names();
+       static const std::vector<std::wstring>& names();
 
        /**
         * Calculate a tweened value given a timepoint within the total duration
@@ -77,4 +77,4 @@ private:
        std::function<double(double, double, double, double)> func_;
 };
 
-}}
\ No newline at end of file
+}