From 365f971d5f452664f04cc11e7fa339c6ed8646f0 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Thu, 6 Jul 2017 14:26:42 +0300
Subject: [PATCH] Fix building tests.

--HG--
branch : develop
---
 src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp | 2 +-
 src/libs/vdxf/libdxfrw/intern/dxfwriter.h       | 4 ++--
 src/libs/vdxf/libdxfrw/libdxfrw.h               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
index a17ca195b..17e96ea97 100644
--- a/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
+++ b/src/libs/vdxf/libdxfrw/intern/drw_textcodec.cpp
@@ -81,7 +81,7 @@ std::string DRW_TextCodec::toUtf8(const std::string &s) {
     return encodedString.toStdString();
 }
 
-std::string DRW_TextCodec::fromUtf8(const std::__cxx11::string &s) {
+std::string DRW_TextCodec::fromUtf8(const std::string &s) {
     if (conv == nullptr)
     {
         return s;
diff --git a/src/libs/vdxf/libdxfrw/intern/dxfwriter.h b/src/libs/vdxf/libdxfrw/intern/dxfwriter.h
index c9a8bf981..7a6c0fde8 100644
--- a/src/libs/vdxf/libdxfrw/intern/dxfwriter.h
+++ b/src/libs/vdxf/libdxfrw/intern/dxfwriter.h
@@ -24,8 +24,8 @@ public:
 
     virtual ~dxfWriter() = default;
     virtual bool writeString(int code, std::string text) = 0;
-    bool writeUtf8String(int code, const std::__cxx11::string &text);
-    bool writeUtf8Caps(int code, const std::__cxx11::string &text);
+    bool writeUtf8String(int code, const std::string &text);
+    bool writeUtf8Caps(int code, const std::string &text);
     std::string fromUtf8String(std::string t) {return encoder.fromUtf8(t);}
     virtual bool writeInt16(int code, int data) = 0;
     virtual bool writeInt32(int code, int data) = 0;
diff --git a/src/libs/vdxf/libdxfrw/libdxfrw.h b/src/libs/vdxf/libdxfrw/libdxfrw.h
index 02600406d..0454adcaa 100644
--- a/src/libs/vdxf/libdxfrw/libdxfrw.h
+++ b/src/libs/vdxf/libdxfrw/libdxfrw.h
@@ -66,7 +66,7 @@ public:
     bool writeText(DRW_Text *ent);
     bool writeHatch(DRW_Hatch *ent);
     bool writeViewport(DRW_Viewport *ent);
-    DRW_ImageDef *writeImage(DRW_Image *ent, const std::__cxx11::string &name);
+    DRW_ImageDef *writeImage(DRW_Image *ent, const std::string &name);
     bool writeLeader(DRW_Leader *ent);
     bool writeDimension(DRW_Dimension *ent);
     void setEllipseParts(int parts){elParts = parts;} /*!< set parts munber when convert ellipse to polyline */