Merge pull request #1818 from taketwo/fix-odr-violation

Move RGBValue to anonymous namespace
PointCloudLibrary · Feb 9, 2017 · 5f91d7f · 5f91d7f
2 parents 39901cd + 9acccd6
commit 5f91d7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/io/src/oni_grabber.cpp b/io/src/oni_grabber.cpp
@@ -46,7 +46,7 @@
 #include <pcl/exceptions.h>
 #include <iostream>
 
-namespace pcl
+namespace
 {
   typedef union
   {
@@ -60,6 +60,10 @@ namespace pcl
     float float_value;
     long long_value;
   } RGBValue;
+}
+
+namespace pcl
+{
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ONIGrabber::ONIGrabber (const std::string& file_name, bool repeat, bool stream)

diff --git a/io/src/openni2_grabber.cpp b/io/src/openni2_grabber.cpp
@@ -53,7 +53,7 @@
 
 using namespace pcl::io::openni2;
 
-namespace pcl
+namespace
 {
   // Treat color as chars, float32, or uint32
   typedef union