mirror of
https://github.com/opencv/opencv_contrib.git
synced 2025-10-17 15:26:00 +08:00
Update tinyxml2 to be under cv namespace
Rework tinyxml2 in this module to have namespace cv::tinyxml2 instead of just tinyxml2, so will not clash with other versions of tinyxml2 at linkage time.
This commit is contained in:
@@ -57,7 +57,7 @@ namespace datasets
|
||||
{
|
||||
|
||||
using namespace std;
|
||||
using namespace tinyxml2;
|
||||
using namespace cv::tinyxml2;
|
||||
|
||||
class OR_pascalImp CV_FINAL : public OR_pascal
|
||||
{
|
||||
|
@@ -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
|
||||
|
@@ -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 @@ private:
|
||||
|
||||
|
||||
} // tinyxml2
|
||||
} // cv
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
|
@@ -57,7 +57,7 @@ namespace datasets
|
||||
{
|
||||
|
||||
using namespace std;
|
||||
using namespace tinyxml2;
|
||||
using namespace cv::tinyxml2;
|
||||
|
||||
class TR_svtImp CV_FINAL : public TR_svt
|
||||
{
|
||||
|
Reference in New Issue
Block a user