Merge pull request #993 from Yangqing/sweep
authorJeff Donahue <jeff.donahue@gmail.com>
Wed, 27 Aug 2014 23:01:23 +0000 (16:01 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Wed, 27 Aug 2014 23:01:23 +0000 (16:01 -0700)
fix layer_factory.cpp bug: there should be no ifdefs


Trivial merge