external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refine code to allow search for conflicts.

Browse source
This commit is contained in:
winlin 2022-12-25 16:26:15 +08:00
parent ead49e747b
commit 5d48c9ce1b
6 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_config.hpp
View file

@ -32,11 +32,11 @@ class SrsConfDirective;
/**
* whether the two vector actual equals, for instance,
* srs_vector_actual_equals([0, 1, 2], [0, 1, 2]) ==== true
* srs_vector_actual_equals([0, 1, 2], [2, 1, 0]) ==== true
* srs_vector_actual_equals([0, 1, 2], [0, 2, 1]) ==== true
* srs_vector_actual_equals([0, 1, 2], [0, 1, 2, 3]) ==== false
* srs_vector_actual_equals([1, 2, 3], [0, 1, 2]) ==== false
* srs_vector_actual_equals([0, 1, 2], [0, 1, 2]) is true
* srs_vector_actual_equals([0, 1, 2], [2, 1, 0]) is true
* srs_vector_actual_equals([0, 1, 2], [0, 2, 1]) is true
* srs_vector_actual_equals([0, 1, 2], [0, 1, 2, 3]) is false
* srs_vector_actual_equals([1, 2, 3], [0, 1, 2]) is false
*/
template<typename T>
bool srs_vector_actual_equals(const std::vector<T>& a, const std::vector<T>& b)

2
trunk/src/app/srs_app_utility.hpp
View file

@ -685,7 +685,7 @@ extern std::string srs_string_dumps_hex(const char* str, int length, int limit);
extern std::string srs_string_dumps_hex(const char* str, int length, int limit, char seperator, int line_limit, char newline);
// Get ENV variable, which may starts with $.
// srs_getenv("EIP") === srs_getenv("$EIP")
// srs_getenv("EIP") is srs_getenv("$EIP")
extern std::string srs_getenv(const std::string& key);
#endif