Merge pull request #2603 from idscan:issue-2590-hide-tinyxml-in-cv-workspace

Author: alalek

modules/datasets/src/or_pascal.cpp

@@ -57,7 +57,7 @@ namespace datasets
 {
 
 using namespace std;
-using namespace tinyxml2;
+using namespace cv::tinyxml2;
 
 class OR_pascalImp CV_FINAL : public OR_pascal
 {

modules/datasets/src/tinyxml2/tinyxml2.cpp

@@ -61,6 +61,8 @@ static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
         }										\
     }
 
+namespace cv
+{
 namespace tinyxml2
 {
 
@@ -2201,3 +2203,4 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
 }
 
 }   // namespace tinyxml2
+}   // namespace cv

modules/datasets/src/tinyxml2/tinyxml2.h

@@ -126,6 +126,8 @@ static const int TIXML2_MAJOR_VERSION = 2;
 static const int TIXML2_MINOR_VERSION = 1;
 static const int TIXML2_PATCH_VERSION = 0;
 
+namespace cv
+{
 namespace tinyxml2
 {
 class XMLDocument;
@@ -2071,6 +2073,7 @@ class TINYXML2_LIB XMLPrinter : public XMLVisitor
 
 
 }	// tinyxml2
+}	// cv
 
 #if defined(_MSC_VER)
 #   pragma warning(pop)

modules/datasets/src/tr_svt.cpp

@@ -57,7 +57,7 @@ namespace datasets
 {
 
 using namespace std;
-using namespace tinyxml2;
+using namespace cv::tinyxml2;
 
 class TR_svtImp CV_FINAL : public TR_svt
 {