Skip to content

Commit

Permalink
turn off autostyle for new versions and shift to Allman
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnLangford committed Jul 19, 2017
1 parent d0f2afa commit 146e558
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ trim_trailing_whitespace = true
[*.{cc,h}]
indent_style = space
indent_size = 2
indent_brace_style = Horstmann
indent_brace_style = Allman

# Makefiles need tab indentation
[Makefile]
Expand Down
4 changes: 2 additions & 2 deletions utl/new_version
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#sudo apt-get install npm
#sudo npm install -g eclint

find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | xargs eclint fix
find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | grep -v vw_clr | xargs astyle -s2 --style=horstmann --lineend=linux --keep-one-line-blocks --keep-one-line-statements
#find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | xargs eclint fix
#find -regextype posix-extended -regex '.*\.(cc|h|cpp)' | grep -v vw_clr | xargs astyle -s2 --style=horstmann --lineend=linux --keep-one-line-blocks --keep-one-line-statements
git commit -a -m "consistent indentation with astyle (before releasing $1)"
git push
git branch $1
Expand Down
3 changes: 1 addition & 2 deletions vowpalwabbit/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ vw* setup(int argc, char* argv[])
all->vw_is_main = true;

if (!all->quiet && !all->bfgs && !all->searchstr && !all->vm.count("audit_regressor"))
{ all->trace_message << std::left
{ all->trace_message << std::left
<< std::setw(shared_data::col_avg_loss) << std::left << "average"
<< " "
<< std::setw(shared_data::col_since_last) << std::left << "since"
Expand Down Expand Up @@ -127,4 +127,3 @@ int main(int argc, char *argv[])
// cin.ignore();
return 0;
}

0 comments on commit 146e558

Please sign in to comment.