[mlpack-git] master: Merge pull request #459 from stereomatchingkiss/ann_workaround (c700949)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/6e9a7465d7739e05e6b4aa650e1f87c45e9cd656...c700949f98ad5608badb967804d96974ff3aa52b

>---------------------------------------------------------------

commit c700949f98ad5608badb967804d96974ff3aa52b
Merge: 6e9a746 0672de4
Author: Marcus Edel <marcus.edel at fu-berlin.de>
Date:   Tue Oct 13 11:10:47 2015 +0200

    Merge pull request #459 from stereomatchingkiss/ann_workaround
    
    fix vc2015 compile issue


>---------------------------------------------------------------

c700949f98ad5608badb967804d96974ff3aa52b
 src/mlpack/methods/ann/cnn.hpp | 715 ++++++++++++++++++++--------------------
 src/mlpack/methods/ann/ffn.hpp | 717 +++++++++++++++++++++--------------------
 2 files changed, 723 insertions(+), 709 deletions(-)