X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftexstream.cpp;h=1523ca9470ebf2447af87ec8f8dc7e446c58403e;hb=45e8ea4acc557dd54e062750f47ff569b5b98c43;hp=9f46a87db2055302a2c28c41f26eee1fdfea3474;hpb=d739e485743a7c864bac5748f9475466172106de;p=lyx.git

diff --git a/src/texstream.cpp b/src/texstream.cpp
index 9f46a87db2..1523ca9470 100644
--- a/src/texstream.cpp
+++ b/src/texstream.cpp
@@ -123,7 +123,7 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
 	otexrowstream & otrs = ots;
 	if (ots.canBreakLine()) {
 	    if (ots.terminateCommand())
-		    otrs << "{}";
+			otrs << "{}";
 		otrs << "%\n";
 		ots.lastChar('\n');
 	}
@@ -179,7 +179,7 @@ otexstream & operator<<(otexstream & ots, TexString ts)
 
 	otexrowstream & otrs = ots;
 	bool isprotected = false;
-	char const c = ts.str[0];
+	char_type const c = ts.str[0];
 	if (ots.protectSpace()) {
 		if (!ots.canBreakLine() && c == ' ') {
 			otrs << "{}";
@@ -223,7 +223,7 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
 		return ots;
 	otexrowstream & otrs = ots;
 	bool isprotected = false;
-	char const c = s[0];
+	char_type const c = s[0];
 	if (ots.protectSpace()) {
 		if (!ots.canBreakLine() && c == ' ') {
 			otrs << "{}";
@@ -330,7 +330,7 @@ template otexrowstream & operator<< <unsigned int>(otexrowstream &,
 template otexrowstream & operator<< <unsigned long>(otexrowstream &,
 													unsigned long);
 
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 template otexrowstream & operator<< <unsigned long long>(otexrowstream &,
                                                          unsigned long long);
 #endif
@@ -351,8 +351,8 @@ template otexstream & operator<< <double>(otexstream &, double);
 template otexstream & operator<< <int>(otexstream &, int);
 template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
 template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
-#ifdef LYX_USE_LONG_LONG
+#ifdef HAVE_LONG_LONG_INT
 template otexstream & operator<< <unsigned long long>(otexstream &, unsigned long long);
 #endif
 
-}
+} // namespace lyx