From e5e3ba75ecf716ad6760d8b74d095729306e1219 Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Wed, 9 Feb 2011 10:51:01 +0100 Subject: Removing the ext_std masterpiece --- basebmp/test/basictest.cxx | 2 -- basebmp/test/bmpmasktest.cxx | 2 -- basebmp/test/bmptest.cxx | 2 -- basebmp/test/cliptest.cxx | 2 -- basebmp/test/filltest.cxx | 2 -- basebmp/test/linetest.cxx | 2 -- basebmp/test/masktest.cxx | 2 -- basebmp/test/polytest.cxx | 2 -- basegfx/test/basegfx1d.cxx | 2 -- basegfx/test/basegfx2d.cxx | 2 -- basegfx/test/basegfx3d.cxx | 2 -- basegfx/test/basegfxtools.cxx | 2 -- basegfx/test/boxclipper.cxx | 2 -- basegfx/test/clipstate.cxx | 2 -- basegfx/test/genericclipper.cxx | 2 -- comphelper/qa/test_string.cxx | 4 ++-- comphelper/qa/test_weakbag.cxx | 3 +-- i18npool/qa/cppunit/test_breakiterator.cxx | 2 -- o3tl/qa/test-cow_wrapper.cxx | 2 -- o3tl/qa/test-heap_ptr.cxx | 2 -- o3tl/qa/test-range.cxx | 2 -- o3tl/qa/test-vector_pool.cxx | 2 -- sax/qa/cppunit/test_converter.cxx | 2 -- svl/qa/test_URIHelper.cxx | 2 -- tools/qa/test_pathutils.cxx | 2 -- tools/qa/test_reversemap.cxx | 2 -- vcl/inc/vcl/graphite_adaptors.hxx | 4 +--- vcl/inc/vcl/graphite_features.hxx | 2 -- vcl/inc/vcl/graphite_layout.hxx | 2 -- vcl/source/glyphs/graphite_adaptors.cxx | 2 +- vcl/source/glyphs/graphite_cache.cxx | 2 -- vcl/source/glyphs/graphite_features.cxx | 6 +++--- vcl/source/glyphs/graphite_layout.cxx | 12 +++++------- vcl/source/glyphs/graphite_textsrc.cxx | 10 +++++----- vcl/source/glyphs/graphite_textsrc.hxx | 4 +--- 35 files changed, 19 insertions(+), 80 deletions(-) diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx index 70218b085059..d953095585fa 100644 --- a/basebmp/test/basictest.cxx +++ b/basebmp/test/basictest.cxx @@ -28,12 +28,10 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 79e9b8fd3909..5ba477484903 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx index 5732e4527562..7b3a2cbcb18f 100644 --- a/basebmp/test/bmptest.cxx +++ b/basebmp/test/bmptest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx index 3071cde74d57..c41edf3e28a8 100644 --- a/basebmp/test/cliptest.cxx +++ b/basebmp/test/cliptest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx index f36d95e6be72..d15fa1010050 100644 --- a/basebmp/test/filltest.cxx +++ b/basebmp/test/filltest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx index f7894357c6cf..cee66f4d709b 100644 --- a/basebmp/test/linetest.cxx +++ b/basebmp/test/linetest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx index e39f118753ba..239a069bf564 100644 --- a/basebmp/test/masktest.cxx +++ b/basebmp/test/masktest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx index 4fe18ee1101a..99aba1a06fc4 100644 --- a/basebmp/test/polytest.cxx +++ b/basebmp/test/polytest.cxx @@ -28,11 +28,9 @@ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx index 40ebba3810fe..20cb6846f548 100644 --- a/basegfx/test/basegfx1d.cxx +++ b/basegfx/test/basegfx1d.cxx @@ -31,12 +31,10 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "postextstl.h" namespace basegfx1d { diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 2f10a638141c..9a6c2dac4a38 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -31,11 +31,9 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx index 1233b8cd255f..5ac16fafc6a4 100644 --- a/basegfx/test/basegfx3d.cxx +++ b/basegfx/test/basegfx3d.cxx @@ -31,11 +31,9 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" namespace basegfx3d { diff --git a/basegfx/test/basegfxtools.cxx b/basegfx/test/basegfxtools.cxx index 4811369a9e9c..4380aafedad8 100644 --- a/basegfx/test/basegfxtools.cxx +++ b/basegfx/test/basegfxtools.cxx @@ -31,11 +31,9 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx index 404d9b9848ac..4d809bb47404 100644 --- a/basegfx/test/boxclipper.cxx +++ b/basegfx/test/boxclipper.cxx @@ -31,11 +31,9 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx index f1a6b4361618..d8c1066c85f1 100644 --- a/basegfx/test/clipstate.cxx +++ b/basegfx/test/clipstate.cxx @@ -31,11 +31,9 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx index 8b51a37ff5be..81d8acdf30ad 100644 --- a/basegfx/test/genericclipper.cxx +++ b/basegfx/test/genericclipper.cxx @@ -31,11 +31,9 @@ #include "precompiled_basegfx.hxx" // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx index e764c9f73ef7..7f15e96a42f5 100644 --- a/comphelper/qa/test_string.cxx +++ b/comphelper/qa/test_string.cxx @@ -30,11 +30,11 @@ #include "sal/config.h" #include "comphelper/string.hxx" -#include "preextstl.h" + #include #include #include -#include "postextstl.h" + #include "rtl/string.h" #include "rtl/ustring.h" #include "rtl/ustring.hxx" diff --git a/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx index b61727e0429d..cc5373d5d6d6 100644 --- a/comphelper/qa/test_weakbag.cxx +++ b/comphelper/qa/test_weakbag.cxx @@ -33,11 +33,10 @@ #include "com/sun/star/uno/XInterface.hpp" #include "comphelper/weakbag.hxx" #include "cppuhelper/weak.hxx" -#include "preextstl.h" + #include #include #include -#include "postextstl.h" namespace { diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index d1a6130ad26a..a6ea552e2727 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -26,13 +26,11 @@ */ #include "precompiled_i18npool.hxx" -#include "preextstl.h" #include #include #include #include #include -#include "postextstl.h" #include #include diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx index 5d8084b903d4..06881b333802 100644 --- a/o3tl/qa/test-cow_wrapper.cxx +++ b/o3tl/qa/test-cow_wrapper.cxx @@ -1,12 +1,10 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include "postextstl.h" #include "cow_wrapper_clients.hxx" diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx index 5fab1ba12ae6..381b8a31d541 100644 --- a/o3tl/qa/test-heap_ptr.cxx +++ b/o3tl/qa/test-heap_ptr.cxx @@ -26,11 +26,9 @@ * ************************************************************************/ -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx index 8183e2d06360..ee45744c1338 100644 --- a/o3tl/qa/test-range.cxx +++ b/o3tl/qa/test-range.cxx @@ -26,11 +26,9 @@ * ************************************************************************/ -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include #include diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx index 975dd8b98a82..1e3ec7a98175 100644 --- a/o3tl/qa/test-vector_pool.cxx +++ b/o3tl/qa/test-vector_pool.cxx @@ -1,11 +1,9 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ // autogenerated file with codegen.pl -#include "preextstl.h" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" -#include "postextstl.h" #include diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx index dea766aabbd3..dcd5bb7e5cc8 100644 --- a/sax/qa/cppunit/test_converter.cxx +++ b/sax/qa/cppunit/test_converter.cxx @@ -26,12 +26,10 @@ * ************************************************************************/ -#include "preextstl.h" #include #include #include #include -#include "postextstl.h" #include diff --git a/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx index 4c850356f261..c206def13830 100644 --- a/svl/qa/test_URIHelper.cxx +++ b/svl/qa/test_URIHelper.cxx @@ -31,13 +31,11 @@ #include "sal/config.h" -#include "preextstl.h" #include #include #include #include #include -#include "postextstl.h" #include diff --git a/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx index fcd838767425..99046a6211c9 100644 --- a/tools/qa/test_pathutils.cxx +++ b/tools/qa/test_pathutils.cxx @@ -31,11 +31,9 @@ #include -#include "preextstl.h" #include #include #include -#include "postextstl.h" #include "tools/pathutils.hxx" diff --git a/tools/qa/test_reversemap.cxx b/tools/qa/test_reversemap.cxx index 193713f81d97..b38771df11f3 100644 --- a/tools/qa/test_reversemap.cxx +++ b/tools/qa/test_reversemap.cxx @@ -34,11 +34,9 @@ #include "precompiled_tools.hxx" #include "sal/config.h" -#include "preextstl.h" #include #include #include -#include "postextstl.h" #include #include diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx index 62c1f97cd823..439a87bda947 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/vcl/graphite_adaptors.hxx @@ -48,11 +48,9 @@ #include "vcl/dllapi.h" // Libraries -#include #include #include #include -#include // Module type definitions and forward declarations. // @@ -112,7 +110,7 @@ public: const grutils::GrFeatureParser * features() const { return mpFeatures; }; private: - virtual void UniqueCacheInfo(ext_std::wstring &, bool &, bool &); + virtual void UniqueCacheInfo(std::wstring &, bool &, bool &); FreetypeServerFont& mrFont; FontProperties maFontProperties; diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx index a817fa190f6e..5dda6825ce76 100644 --- a/vcl/inc/vcl/graphite_features.hxx +++ b/vcl/inc/vcl/graphite_features.hxx @@ -30,11 +30,9 @@ // Parse a string of features specified as ; separated pairs. // e.g. // 1001=1&2002=2&fav1=0 -#include #include #include #include -#include namespace grutils { diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx index 3192822db391..60c7de16b1dd 100644 --- a/vcl/inc/vcl/graphite_layout.hxx +++ b/vcl/inc/vcl/graphite_layout.hxx @@ -41,13 +41,11 @@ #include #include // Libraries -#include #include #include #include #include #include -#include // Platform #include #include diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx index ae3cccdaf9a1..a4f1860d9bfb 100644 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ b/vcl/source/glyphs/graphite_adaptors.cxx @@ -174,7 +174,7 @@ GraphiteFontAdaptor::~GraphiteFontAdaptor() throw() mpFeatures = NULL; } -void GraphiteFontAdaptor::UniqueCacheInfo(ext_std::wstring & face_name_out, bool & bold_out, bool & italic_out) +void GraphiteFontAdaptor::UniqueCacheInfo(std::wstring & face_name_out, bool & bold_out, bool & italic_out) { face_name_out = maFontProperties.szFaceName; bold_out = maFontProperties.fBold; diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx index 51c898b1a951..b3f48aa1c476 100644 --- a/vcl/source/glyphs/graphite_cache.cxx +++ b/vcl/source/glyphs/graphite_cache.cxx @@ -37,10 +37,8 @@ #include #include -#include #include #include -#include #include #include diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx index 23325f963b37..a49505d7d9e5 100644 --- a/vcl/source/glyphs/graphite_features.cxx +++ b/vcl/source/glyphs/graphite_features.cxx @@ -88,7 +88,7 @@ GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string features, co gr::isocode aLang = maLang; for (size_t i = pos; i < nFeatEnd; i++) aLang.rgch[i-pos] = features[i]; - ext_std::pair aSupported + std::pair aSupported = font.getSupportedLanguages(); gr::LanguageIterator iL = aSupported.first; while (iL != aSupported.second) @@ -139,7 +139,7 @@ void GrFeatureParser::setLang(gr::Font & font, const std::string & lang) if (lang[i] == '-') break; aLang.rgch[i] = lang[i]; } - ext_std::pair aSupported + std::pair aSupported = font.getSupportedLanguages(); gr::LanguageIterator iL = aSupported.first; while (iL != aSupported.second) @@ -186,7 +186,7 @@ bool GrFeatureParser::isValid(gr::Font & font, gr::FeatureSetting & setting) { return false; } - ext_std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator > + std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator > validValues = font.getFeatureSettings(i); gr::FeatureSettingIterator j = validValues.first; while (j != validValues.second) diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 2e4812ba5940..01c671ef17ec 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -68,13 +68,11 @@ #include // Graphite Libraries (must be after vcl headers on windows) -#include #include #include #include #include #include -#include #include #include @@ -109,8 +107,8 @@ FILE * grLog() namespace { - typedef ext_std::pair glyph_range_t; - typedef ext_std::pair glyph_set_range_t; + typedef std::pair glyph_range_t; + typedef std::pair glyph_set_range_t; inline long round(const float n) { return long(n + (n < 0 ? -0.5 : 0.5)); @@ -175,7 +173,7 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, bool bRtl, long &rWidth, float fScaling, std::vector & rChar2Base, std::vector & rGlyph2Char, std::vector & rCharDxs) { // Create a glyph item for each of the glyph and append it to the base class glyph list. - typedef ext_std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet; + typedef std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet; int nChar = rArgs.mnEndCharPos - rArgs.mnMinCharPos; glyph_range_t iGlyphs = rSegment.glyphs(); int nGlyphs = iGlyphs.second - iGlyphs.first; @@ -652,7 +650,7 @@ public: sal_Int32 hashCode(const grutils::GrFeatureParser * mpFeatures) { // is this sufficient? - ext_std::wstring aFace; + std::wstring aFace; bool bBold; bool bItalic; UniqueCacheInfo(aFace, bBold, bItalic); @@ -677,7 +675,7 @@ public: return hash; }; protected: - virtual void UniqueCacheInfo( ext_std::wstring& stuFace, bool& fBold, bool& fItalic ) + virtual void UniqueCacheInfo( std::wstring& stuFace, bool& fBold, bool& fItalic ) { #ifdef WIN32 dynamic_cast(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic); diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx index e8967701a52c..33508ae34712 100644 --- a/vcl/source/glyphs/graphite_textsrc.cxx +++ b/vcl/source/glyphs/graphite_textsrc.cxx @@ -136,16 +136,16 @@ gr::isocode TextSourceAdaptor::getLanguage(gr::toffset) return unknown; } -ext_std::pair TextSourceAdaptor::propertyRange(gr::toffset nCharIdx) +std::pair TextSourceAdaptor::propertyRange(gr::toffset nCharIdx) { if (nCharIdx < unsigned(maLayoutArgs.mnMinCharPos)) - return ext_std::make_pair(0, maLayoutArgs.mnMinCharPos); + return std::make_pair(0, maLayoutArgs.mnMinCharPos); if (nCharIdx < mnEnd) - return ext_std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd); + return std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd); - return ext_std::make_pair(mnEnd, maLayoutArgs.mnLength); + return std::make_pair(mnEnd, maLayoutArgs.mnLength); } size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * settings) @@ -157,7 +157,7 @@ size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * sett bool TextSourceAdaptor::sameSegment(gr::toffset char_idx1, gr::toffset char_idx2) { - const ext_std::pair + const std::pair range1 = propertyRange(char_idx1), range2 = propertyRange(char_idx2); diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx index ca905fc0d824..c5ef0ac7b43d 100644 --- a/vcl/source/glyphs/graphite_textsrc.hxx +++ b/vcl/source/glyphs/graphite_textsrc.hxx @@ -52,11 +52,9 @@ #include "vcl/dllapi.h" // Libraries -#include #include #include #include -#include // Module type definitions and forward declarations. // @@ -83,7 +81,7 @@ public: virtual float getVerticalOffset(gr::toffset ich); virtual gr::isocode getLanguage(gr::toffset ich); - virtual ext_std::pair propertyRange(gr::toffset ich); + virtual std::pair propertyRange(gr::toffset ich); virtual size_t getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset); virtual bool sameSegment(gr::toffset ich1, gr::toffset ich2); virtual bool featureVariations() { return false; } -- cgit