Fixing a problem with conflict of ROS and opencv flann

modules/flann/include/opencv2/flann/general.h

@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef CONSTANTS_H
-#define CONSTANTS_H
+#ifndef OPENCV_CONSTANTS_H
+#define OPENCV_CONSTANTS_H
 
 #ifdef __cplusplus
 
@@ -146,4 +146,4 @@ struct CV_EXPORTS SearchParams {
 
 #endif
 
-#endif  /* CONSTANTS_H */
+#endif  /* OPENCV_CONSTANTS_H */

modules/flann/include/opencv2/flann/object_factory.h

@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *************************************************************************/
 
-#ifndef OBJECT_FACTORY_H_
-#define OBJECT_FACTORY_H_
+#ifndef OPENCV_OBJECT_FACTORY_H_
+#define OPENCV_OBJECT_FACTORY_H_
 
 #include "opencv2/core/types_c.h"
 #include <map>