Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 21:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/776-using-statements'

Browse source 
* origin/topic/timw/776-using-statements:
  Remove 'using namespace std' from SerialTypes.h
  Remove other using statements from headers
  GH-776: Remove using statements added by PR 770

Includes small fixes in files that changed since the merge request was
made.

Also includes a few small indentation fixes.
This commit is contained in:
Johanna Amann 2020-04-09 13:11:12 -07:00
commit 876c803d75
147 changed files with 553 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Attr.cc
View file

@ -106,7 +106,7 @@ void Attr::DescribeReST(ODesc* d, bool shorten) const
ODesc dd;
dd.SetQuotes(true);
expr->Describe(&dd);
string s = dd.Description();
std::string s = dd.Description();
add_long_expr_string(d, s, shorten);
}
@ -114,7 +114,7 @@ void Attr::DescribeReST(ODesc* d, bool shorten) const
{
ODesc dd;
expr->Eval(nullptr)->Describe(&dd);
string s = dd.Description();
std::string s = dd.Description();
for ( size_t i = 0; i < s.size(); ++i )
if ( s[i] == '\n' )