[EMAIL PROTECTED] wrote:
Author: lasgouttes
Date: Fri Feb 1 16:36:53 2008
New Revision: 22735
URL: http://www.lyx.org/trac/changeset/22735
Log:
Remove unused macros USE_INCLUDED_STRING and STD_STRING_IS_GOOD
Remove a few unused headers
Modified:
lyx-devel/trunk/src/support/lstrings.cpp
Modified: lyx-devel/trunk/src/support/lstrings.cpp
URL:
http://www.lyx.org/trac/file/lyx-devel/trunk/src/support/lstrings.cpp?rev=22735
==============================================================================
@@ -485,11 +480,8 @@
if (prelen > alen || a.empty())
return false;
-#if defined(STD_STRING_IS_GOOD)
- return a.compare(0, prelen, pre) == 0;
-#else
- return ::strncmp(a.c_str(), pre.c_str(), prelen) == 0;
-#endif
+ else
+ return a.compare(0, prelen, pre) == 0;
The else is superfluous here.
@@ -524,16 +516,10 @@
{
size_t const suflen = suf.length();
size_t const alen = a.length();
-
if (suflen > alen)
return false;
-
-#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
- string tmp(a, alen - suflen);
- return ::strncmp(tmp.c_str(), suf.c_str(), suflen) == 0;
-#else
- return a.compare(alen - suflen, suflen, suf) == 0;
-#endif
+ else
+ return a.compare(alen - suflen, suflen, suf) == 0;
and here.
Abdel.
