mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	core: fix warnings in windows.cpp
The compiler was (correctly) complaining about a const char * to char * conversion. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
		
							parent
							
								
									540cba07f3
								
							
						
					
					
						commit
						a3f540fe34
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		|  | @ -25,7 +25,7 @@ | ||||||
|  * note: the standard library's <codecvt> was deprecated and is in |  * note: the standard library's <codecvt> was deprecated and is in | ||||||
|  * an ominous state, so use the native Windows version for now. |  * an ominous state, so use the native Windows version for now. | ||||||
|  */ |  */ | ||||||
| static std::string utf16_to_utf8_fl(const std::wstring &utf16, char *file, int line) | static std::string utf16_to_utf8_fl(const std::wstring &utf16, const char *file, int line) | ||||||
| { | { | ||||||
| 	assert(utf16 != NULL); | 	assert(utf16 != NULL); | ||||||
| 	assert(file != NULL); | 	assert(file != NULL); | ||||||
|  | @ -108,7 +108,7 @@ bool subsurface_ignore_font(const char *font) | ||||||
| /* this function converts a utf-8 string to win32's utf-16 2 byte string.
 | /* this function converts a utf-8 string to win32's utf-16 2 byte string.
 | ||||||
|  * the caller function should manage the allocated memory. |  * the caller function should manage the allocated memory. | ||||||
|  */ |  */ | ||||||
| static wchar_t *utf8_to_utf16_fl(const char *utf8, char *file, int line) | static wchar_t *utf8_to_utf16_fl(const char *utf8, const char *file, int line) | ||||||
| { | { | ||||||
| 	assert(utf8 != NULL); | 	assert(utf8 != NULL); | ||||||
| 	assert(file != NULL); | 	assert(file != NULL); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue