Skip to content

fix a google string vs std::string issue for easier import#5685

Merged
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
stevenzzzz:fix-tmp-reference
Jan 23, 2019
Merged

fix a google string vs std::string issue for easier import#5685
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
stevenzzzz:fix-tmp-reference

Conversation

@stevenzzzz
Copy link
Contributor

Signed-off-by: Xin Zhuang stevenzzz@google.com

Convert the right hand side log-level string into a raw char* before comparing it with a fmt::string_view (which is fmt::basic_string_view). This change enables templated string implementation to be comparable with fmt::basic_string_view.

Description: compare fmt::string_view to a raw char* in test/server/options_impl_test.cc
Risk Level: LOW
Testing: unit test
[Optional Fixes #Issue]
[Optional Deprecated:]

Signed-off-by: Xin Zhuang <stevenzzz@google.com>
Signed-off-by: Xin Zhuang <stevenzzz@google.com>
Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Xin says that EXPECT_STREQ, so this looks reasonable, thanks.

@mattklein123 mattklein123 merged commit 89a5015 into envoyproxy:master Jan 23, 2019
@stevenzzzz stevenzzzz deleted the fix-tmp-reference branch January 23, 2019 02:47
danzh2010 pushed a commit to danzh2010/envoy that referenced this pull request Jan 24, 2019
…y#5685)

Signed-off-by: Xin Zhuang <stevenzzz@google.com>

Signed-off-by: Dan Zhang <danzh@google.com>
fredlas pushed a commit to fredlas/envoy that referenced this pull request Mar 5, 2019
…y#5685)

Signed-off-by: Xin Zhuang <stevenzzz@google.com>
Signed-off-by: Fred Douglas <fredlas@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants