From d3b70d407e50b9aea9868faa7b0a0c202384d209 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 14 Oct 2017 11:00:29 +0000
Subject: [PATCH] urepo added to canonical upp.src packages; cosmetics

git-svn-id: svn://ultimatepp.org/upp/trunk@11377 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/Ctrl.cpp                 | 2 +-
 uppsrc/ide/MacroManager/MacroElement.cpp | 2 ++
 uppsrc/packages                          | 1 +
 uppsrc/urepo/RepoSync.cpp                | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index 815948d45..f9317bae6 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -531,7 +531,7 @@ void Ctrl::Dump(Stream& s) const {
 	LG("Rect:   " << GetRect());
 	LG("View:   " << GetView());
 	for(int i = 0; i < frame.GetCount(); i++)
-		LG("Frame " << i << ": " << typeid(*frame[i].frame).name() << " - " << frame[i].view);
+		LG("Frame " << i << ": " << typeid(decltype(*frame[i].frame)).name() << " - " << frame[i].view);
 	LG("Data: " << GetData().ToString());
 	if(firstchild) {
 		LG("Children");
diff --git a/uppsrc/ide/MacroManager/MacroElement.cpp b/uppsrc/ide/MacroManager/MacroElement.cpp
index 705ead4fd..c6e39beca 100644
--- a/uppsrc/ide/MacroManager/MacroElement.cpp
+++ b/uppsrc/ide/MacroManager/MacroElement.cpp
@@ -17,6 +17,8 @@ Image MacroElement::GetImage() const
 			return MacroManagerImg::Macro();
 		case(Type::FUNCTION):
 			return MacroManagerImg::Fn();
+		case(Type::UNKNOWN): // silence CLANG warning
+			break;
 	}
 	return Image();
 }
diff --git a/uppsrc/packages b/uppsrc/packages
index 197d6e034..c12cc7d66 100644
--- a/uppsrc/packages
+++ b/uppsrc/packages
@@ -34,6 +34,7 @@ TextDiffCtrl
 ODBC
 MSSQL
 usvn
+urepo
 art
 Painter
 XmlRpc
diff --git a/uppsrc/urepo/RepoSync.cpp b/uppsrc/urepo/RepoSync.cpp
index f43ce2d94..80d5dbb91 100644
--- a/uppsrc/urepo/RepoSync.cpp
+++ b/uppsrc/urepo/RepoSync.cpp
@@ -123,7 +123,6 @@ bool RepoSync::ListGit(const String& path)
 				color = Gray;
 			}
 			else {
-				int q = file.ReverseFind('.');
 				static const char *as[] = {
 					"Modify", "Resolved", "Add", "Remove", "Rename"
 				};