Fix broken merge

	modified:   common/include/pcl/pcl_macros.h
	modified:   surface/include/pcl/surface/impl/poisson/sparse_matrix.hpp