Merge pull request #289 from cchampet/build_fixMSVCWarnings

cchampet · web-flow · commit f8044f8d11de · 2016-11-07T20:07:46.000+01:00
CMake: fix msvc warnings at compile time
diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
@@ -79,7 +79,7 @@ class AvExport Option
     void setRatio(const int num, const int den);
 
     // array of childs
-    bool hasChild() const { return _childOptions.size(); }
+    bool hasChild() const { return ! _childOptions.empty(); }
     const std::vector<Option>& getChilds() const { return _childOptions; }
     const Option& getChildAtIndex(const size_t index) const { return _childOptions.at(index); }
     int getDefaultChildIndex() const { return _defaultChildIndex; }
diff --git a/src/AvTranscoder/transform/AudioTransform.hpp b/src/AvTranscoder/transform/AudioTransform.hpp
@@ -11,7 +11,7 @@
 #define ResampleContext SwrContext
 #endif
 
-class ResampleContext;
+struct ResampleContext;
 
 namespace avtranscoder
 {
diff --git a/src/AvTranscoder/transform/VideoTransform.hpp b/src/AvTranscoder/transform/VideoTransform.hpp
@@ -5,7 +5,7 @@
 
 #include <AvTranscoder/data/decoded/VideoFrame.hpp>
 
-class SwsContext;
+struct SwsContext;
 
 namespace avtranscoder
 {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#define ResampleContext SwrContext`
`12`	`12`	`#endif`
`13`	`13`
`14`		`-class ResampleContext;`
	`14`	`+struct ResampleContext;`
`15`	`15`
`16`	`16`	`namespace avtranscoder`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include <AvTranscoder/data/decoded/VideoFrame.hpp>`
`7`	`7`
`8`		`-class SwsContext;`
	`8`	`+struct SwsContext;`
`9`	`9`
`10`	`10`	`namespace avtranscoder`
`11`	`11`	`{`