removed: AssignString() functions
now we are using UTF-8 <-> wide characters conversions git-svn-id: svn://ttmath.org/publicrep/ezc/trunk@976 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
parent
2fca5f3492
commit
6f9f274e08
|
@ -1,9 +1,12 @@
|
||||||
# DO NOT DELETE
|
# DO NOT DELETE
|
||||||
|
|
||||||
blocks.o: blocks.h item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
blocks.o: blocks.h item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
||||||
|
blocks.o: cache.h
|
||||||
|
cache.o: cache.h item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
||||||
|
cache.o: blocks.h
|
||||||
item.o: item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
item.o: item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
||||||
pattern.o: pattern.h item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
pattern.o: pattern.h item.h funinfo.h functions.h ../../pikotools/utf8/utf8.h
|
||||||
|
pattern.o: cache.h blocks.h
|
||||||
patternparser.o: patternparser.h blocks.h item.h funinfo.h functions.h
|
patternparser.o: patternparser.h blocks.h item.h funinfo.h functions.h
|
||||||
patternparser.o: ../../pikotools/utf8/utf8.h pattern.h
|
patternparser.o: ../../pikotools/utf8/utf8.h cache.h pattern.h
|
||||||
stringconv.o: stringconv.h
|
|
||||||
vars.o: vars.h
|
vars.o: vars.h
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
o = blocks.o item.o pattern.o patternparser.o stringconv.o vars.o
|
o = blocks.o cache.o item.o pattern.o patternparser.o vars.o
|
||||||
|
|
|
@ -1,108 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is a part of EZC -- Easy templating in C++ library
|
|
||||||
* and is distributed under the BSD 3-Clause licence.
|
|
||||||
* Author: Tomasz Sowa <t.sowa@ttmath.org>
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2007-2010, Tomasz Sowa
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* * Redistributions of source code must retain the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* * Neither the name Tomasz Sowa nor the names of contributors to this
|
|
||||||
* project may be used to endorse or promote products derived
|
|
||||||
* from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
|
||||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "stringconv.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace Ezc
|
|
||||||
{
|
|
||||||
|
|
||||||
void AssignString(const char * src, std::wstring & dst, bool clear)
|
|
||||||
{
|
|
||||||
size_t len;
|
|
||||||
|
|
||||||
if( clear )
|
|
||||||
dst.clear();
|
|
||||||
|
|
||||||
for(len=0 ; src[len] ; ++len){}
|
|
||||||
|
|
||||||
if( dst.capacity() < dst.size() + len )
|
|
||||||
dst.reserve(dst.size() + len + 128);
|
|
||||||
|
|
||||||
for( ; *src ; ++src )
|
|
||||||
dst += static_cast<unsigned char>(*src);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void AssignString(const std::string & src, std::wstring & dst, bool clear)
|
|
||||||
{
|
|
||||||
if( clear )
|
|
||||||
dst.clear();
|
|
||||||
|
|
||||||
if( dst.capacity() < dst.size() + src.size() )
|
|
||||||
dst.reserve(dst.size() + src.size() + 128);
|
|
||||||
|
|
||||||
for(size_t i=0 ; i<src.size() ; ++i )
|
|
||||||
dst += static_cast<unsigned char>(src[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void AssignString(const wchar_t * src, std::string & dst, bool clear)
|
|
||||||
{
|
|
||||||
size_t len;
|
|
||||||
|
|
||||||
if( clear )
|
|
||||||
dst.clear();
|
|
||||||
|
|
||||||
for(len=0 ; src[len] ; ++len){}
|
|
||||||
|
|
||||||
if( dst.capacity() < dst.size() + len )
|
|
||||||
dst.reserve(dst.size() + len + 128);
|
|
||||||
|
|
||||||
for( ; *src ; ++src )
|
|
||||||
dst += static_cast<char>(*src);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void AssignString(const std::wstring & src, std::string & dst, bool clear)
|
|
||||||
{
|
|
||||||
if( clear )
|
|
||||||
dst.clear();
|
|
||||||
|
|
||||||
if( dst.capacity() < dst.size() + src.size() )
|
|
||||||
dst.reserve(dst.size() + src.size() + 128);
|
|
||||||
|
|
||||||
for(size_t i=0 ; i<src.size() ; ++i )
|
|
||||||
dst += static_cast<char>(src[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace Ezc
|
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is a part of EZC -- Easy templating in C++ library
|
|
||||||
* and is distributed under the BSD 3-Clause licence.
|
|
||||||
* Author: Tomasz Sowa <t.sowa@ttmath.org>
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2007-2010, Tomasz Sowa
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* * Redistributions of source code must retain the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* * Neither the name Tomasz Sowa nor the names of contributors to this
|
|
||||||
* project may be used to endorse or promote products derived
|
|
||||||
* from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
|
||||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef headerfile_ezc_stringconv
|
|
||||||
#define headerfile_ezc_stringconv
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
namespace Ezc
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
void AssignString(const char * src, std::wstring & dst, bool clear = true);
|
|
||||||
void AssignString(const std::string & src, std::wstring & dst, bool clear = true);
|
|
||||||
void AssignString(const wchar_t * src, std::string & dst, bool clear = true);
|
|
||||||
void AssignString(const std::wstring & src, std::string & dst, bool clear = true);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace Ezc
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
Loading…
Reference in New Issue