X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlength.h;h=c0c658d6931c3032272171ec4f712711052db882;hb=6c2e78e12855d8661eb289ded3dc8722748863b8;hp=01b6d3286f2d1ea559f0f17a30bfde2adb82cd32;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/lyxlength.h b/src/lyxlength.h
index 01b6d3286f..c0c658d693 100644
--- a/src/lyxlength.h
+++ b/src/lyxlength.h
@@ -15,7 +15,16 @@
 #ifndef LYX_LENGTH_H
 #define LYX_LENGTH_H
 
-#include "support/std_string.h"
+#include <string>
+
+// Solaris/x86 version 9 and earlier define these
+#ifdef PC
+#  undef PC
+#endif
+#ifdef SP
+#  undef SP
+#endif
+
 
 /**
  * LyXLength - Represents latex length measurement
@@ -51,7 +60,13 @@ public:
 	LyXLength(double v, LyXLength::UNIT u);
 
 	/// "data" must be a decimal number, followed by a unit
-	explicit LyXLength(string const & data);
+	explicit LyXLength(std::string const & data);
+
+	void swap(LyXLength & rhs)
+	{
+		std::swap(val_, rhs.val_);
+		std::swap(unit_, rhs.unit_);
+	}
 
 	///
 	double value() const;
@@ -66,15 +81,15 @@ public:
 	///
 	bool empty() const;
 	/// return string representation
-	string const asString() const;
+	std::string const asString() const;
 	/// return string representation for LaTeX
-	string const asLatexString() const;
+	std::string const asLatexString() const;
 	/// return the on-screen size of this length
 	int inPixels(int text_width, int em_width = 0) const;
 	/// return the on-screen size of this length of an image
 	int inBP() const;
 
-	friend bool isValidLength(string const & data, LyXLength * result);
+	friend bool isValidLength(std::string const & data, LyXLength * result);
 
 private:
 	///
@@ -89,7 +104,7 @@ bool operator==(LyXLength const & l1, LyXLength const & l2);
 bool operator!=(LyXLength const & l1, LyXLength const & l2);
 /** If "data" is valid, the length represented by it is
     stored into "result", if that is not 0. */
-bool isValidLength(string const & data, LyXLength * result = 0);
+bool isValidLength(std::string const & data, LyXLength * result = 0);
 /// return the name of the given unit number
 char const * stringFromUnit(int unit);