debug build warnings

HertzDevil · May 16, 2018 · e643e8c · e643e8c
1 parent d7853f2
commit e643e8c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/Source/FamiTrackerDocIO.cpp b/Source/FamiTrackerDocIO.cpp
@@ -136,10 +136,6 @@ bool CFamiTrackerDocIO::Load(CFamiTrackerModule &modfile) {
 		{FILE_BLOCK_BOOKMARKS,		&CFamiTrackerDocIO::LoadBookmarks},		// // //
 	};
 
-#ifdef _DEBUG
-	int msgs_ = 0;
-#endif
-
 	// This has to be done for older files
 	if (file_.GetFileVersion() < 0x0210)
 		(void)modfile.GetSong(0);
@@ -156,11 +152,7 @@ bool CFamiTrackerDocIO::Load(CFamiTrackerModule &modfile) {
 			(this->*FTM_READ_FUNC.at(BlockID))(modfile, file_.GetBlockVersion());		// // //
 		}
 		catch (std::out_of_range) {
-#ifdef _DEBUG
-		// This shouldn't show up in release (debug only)
-//			if (++msgs_ < 5)
-//				AfxMessageBox(L"Unknown file block!");
-#endif
+			DEBUG_BREAK();
 			if (file_.IsFileIncomplete())
 				ErrorFlag = true;
 		}

diff --git a/Source/FamiTrackerView.cpp b/Source/FamiTrackerView.cpp
@@ -1090,7 +1090,7 @@ void CFamiTrackerView::OnInitialUpdate()
 
 	CFrameEditor *pFrameEditor = GetFrameEditor();
 
-	TRACE(L"View: OnInitialUpdate (%s)\n", pDoc->GetTitle());
+	TRACE(L"View: OnInitialUpdate (%s)\n", (LPCWSTR)pDoc->GetTitle());
 
 	// Setup order window
 	pFrameEditor->AssignView(*this);		// // //

diff --git a/Source/InstrumentEditDlg.cpp b/Source/InstrumentEditDlg.cpp
@@ -375,7 +375,7 @@ void CInstrumentEditDlg::SwitchOnNote(int x, int y)
 	if (m_KeyboardRect.PtInRect({x, y})) {
 		int KeyPos = (x - m_KeyboardRect.left) % 70;		// // //
 		int Octave = (x - m_KeyboardRect.left) / 70;
-		note_t Note;		// // //
+		note_t Note = note_t::C;		// // //
 
 		if (y > m_KeyboardRect.top + 38) {
 			// Only white keys

diff --git a/Source/PCMImport.cpp b/Source/PCMImport.cpp
@@ -441,7 +441,7 @@ bool CPCMImport::OpenWaveFile()
 	m_iWaveSize = 0;
 	m_ullSampleStart = 0;
 
-	TRACE(L"DPCM import: Loading wave file %s...\n", m_strPath);
+	TRACE(L"DPCM import: Loading wave file %s...\n", (LPCWSTR)m_strPath);
 
 	if (!m_fSampleFile.Open(m_strPath, CFile::modeRead, &ex)) {
 		WCHAR szCause[255] = { };

diff --git a/Source/PatternEditor.cpp b/Source/PatternEditor.cpp
@@ -1156,9 +1156,9 @@ void CPatternEditor::DrawRow(CDC &DC, int Row, int Line, int Frame, bool bPrevie
 	RowColorInfo_t colorInfo;
 	colorInfo.Note = TextColor;
 	switch (Highlight) {
-	case highlight_state_t::none:    colorInfo.Back = pSettings->Appearance.iColBackground; break;
-	case highlight_state_t::beat:    colorInfo.Back = pSettings->Appearance.iColBackgroundHilite; break;
-	case highlight_state_t::measure: colorInfo.Back = pSettings->Appearance.iColBackgroundHilite2; break;
+	case highlight_state_t::beat:          colorInfo.Back = pSettings->Appearance.iColBackgroundHilite; break;
+	case highlight_state_t::measure:       colorInfo.Back = pSettings->Appearance.iColBackgroundHilite2; break;
+	case highlight_state_t::none: default: colorInfo.Back = pSettings->Appearance.iColBackground; break;
 	}
 
 	colorInfo.Shaded = BLEND(TextColor, colorInfo.Back, SHADE_LEVEL::UNUSED);
@@ -1830,7 +1830,6 @@ cursor_column_t CPatternEditor::GetChannelColumns(int Channel) const
 	case 4: return cursor_column_t::EFF4_PARAM2;
 	default: return cursor_column_t::VOLUME;		// // //
 	}
-	return cursor_column_t::NOTE;
 }
 
 int CPatternEditor::GetChannelCount() const

diff --git a/Source/RegisterDisplay.cpp b/Source/RegisterDisplay.cpp
@@ -100,7 +100,7 @@ void CRegisterDisplay::Draw() {
 			GetRegs(sound_chip_t::APU, [&] (int x) { return 0x4000 + i * 4 + x; }, 4);
 			DrawReg(FormattedA("$%04X:", 0x4000 + i * 4), 4);
 
-			int period, vol;
+			int period = 0, vol = 0;
 			double freq = pSoundGen->GetChannelFrequency(sound_chip_t::APU, i);		// // //
 //			dc.FillSolidRect(x + 200, y, x + 400, y + 18, m_colEmptyBg);
 

diff --git a/libft0cc/include/ft0cc/enum_traits.h b/libft0cc/include/ft0cc/enum_traits.h
@@ -212,8 +212,10 @@ template <typename EnumT REQUIRES_IsEnum(EnumT),
 constexpr EnumT enum_min() noexcept {
 	if constexpr (details::enum_has_min_member<EnumT>::value)
 		return EnumT::min;
-	if constexpr (!details::is_enum_category_discrete<get_enum_category_t<EnumT>>::value)
+	else if constexpr (!details::is_enum_category_discrete<get_enum_category_t<EnumT>>::value)
 		return EnumT {std::numeric_limits<std::underlying_type_t<EnumT>>::min()};
+	else
+		static_assert(!sizeof(EnumT), "Minimum element of enum does not exist");
 }
 
 // Checks whether the given enumeration type has a maximum element.
@@ -226,8 +228,10 @@ template <typename EnumT REQUIRES_IsEnum(EnumT),
 constexpr EnumT enum_max() noexcept {
 	if constexpr (details::enum_has_max_member<EnumT>::value)
 		return EnumT::max;
-	if constexpr (!details::is_enum_category_discrete<get_enum_category_t<EnumT>>::value)
+	else if constexpr (!details::is_enum_category_discrete<get_enum_category_t<EnumT>>::value)
 		return EnumT {std::numeric_limits<std::underlying_type_t<EnumT>>::max()};
+	else
+		static_assert(!sizeof(EnumT), "Maximum element of enum does not exist");
 }