Merge pull request #21 from fiendish/msvc2015

msvc2015, explicit cstring conversion
nickgammon · Mar 18, 2016 · 7da5fd3 · 7da5fd3
2 parents c137b97 + a90ab15
commit 7da5fd3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mainfrm.cpp b/mainfrm.cpp
@@ -2045,7 +2045,7 @@ CPoint point;
       strName += CFormat (" (%i)", pDoc->m_new_lines);
 
     if ((pDoc->m_view_number - 1) < TRAY_MENU_COUNT)
-     sWorlds.insert (make_pair (strName, pDoc->m_view_number - 1));
+     sWorlds.insert (make_pair (std::basic_string<TCHAR>(strName), pDoc->m_view_number - 1));
 
     }   // end of doing each world
 

diff --git a/world_debug.cpp b/world_debug.cpp
@@ -213,7 +213,7 @@ VARIANT CMUSHclientDoc::Debug(LPCTSTR Command)
       CColours * pColour;
       CString strColourName;
       App.m_ColoursMap.GetNextAssoc (pos, strColourName, pColour);
-      mColours.insert (make_pair (pColour->iColour, strColourName));
+      mColours.insert (make_pair (pColour->iColour, std::basic_string<TCHAR>(strColourName)));
       }
 
     for (multimap<COLORREF, string, colour_less>::const_iterator it = mColours.begin ();