X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=3a6ae648b25885b5009da363c47659c56098b58e;hb=33f9cfb7961501b38c573eede468b011687f46de;hp=08095a173508efc0c3837a829f4560638b6cceab;hpb=742348262ec6a8f65abc95a50ce0a270b90e4dbb;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 08095a1735..3a6ae648b2 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1771,7 +1771,7 @@ Buffer::ExportStatus Buffer::makeLaTeXFile(FileName const & fname,
 	catch (EncodingException const & e) {
 		docstring const failed(1, e.failed_char);
 		ostringstream oss;
-		oss << "0x" << hex << e.failed_char << dec;
+		oss << "0x" << hex << static_cast<uint32_t>(e.failed_char) << dec;
 		if (getParFromID(e.par_id).paragraph().layout().pass_thru) {
 			docstring msg = bformat(_("Uncodable character '%1$s'"
 						  " (code point %2$s)"),
@@ -2592,16 +2592,16 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 }
 
 
-void Buffer::addBiblioInfo(BiblioInfo const & bin) const
+void Buffer::addBiblioInfo(BiblioInfo const & bi_in) const
 {
 	// We add the biblio info to the parent buffer,
 	// if there is one, but also to this buffer, in case
 	// it is compiled alone.
-	BiblioInfo & bi = d->bibinfo_;
-	bi.mergeBiblioInfo(bin);
+	BiblioInfo & our_bi = d->bibinfo_;
+	our_bi.mergeBiblioInfo(bi_in);
 
 	if (parent())
-		parent()->addBiblioInfo(bin);
+		parent()->addBiblioInfo(bi_in);
 }