Replaced std::pair with struct {first; second;} to avoid constructor …

…syntax in initialization
Haivision · Sep 25, 2017 · bd9c778 · bd9c778
1 parent 0f8b808
commit bd9c778
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/srtcore/smoother.cpp b/srtcore/smoother.cpp
@@ -572,8 +572,8 @@ struct Creator
 
 Smoother::NamePtr Smoother::smoothers[N_SMOOTHERS] =
 {
-    NamePtr("live", Creator<LiveSmoother>::Create),
-    NamePtr("file", Creator<FileSmoother>::Create)
+    {"live", Creator<LiveSmoother>::Create },
+    {"file", Creator<FileSmoother>::Create }
 };
 
 

diff --git a/srtcore/smoother.h b/srtcore/smoother.h
@@ -17,7 +17,8 @@ class Smoother
     // Note that this is a pointer to function :)
 
     static const size_t N_SMOOTHERS = 2;
-    typedef std::pair<const char*, smoother_create_t*> NamePtr;
+    // The first/second is to mimic the map.
+    typedef struct { const char* first; smoother_create_t* second; } NamePtr;
     static NamePtr smoothers[N_SMOOTHERS];
 
     // This is a smoother container.