Merge conflicts

Author: Gunnar Liljas

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

@@ -44,9 +44,7 @@ public class CriteriaQueryTranslator : ICriteriaQuery
 
 		private readonly ICollection<IParameterSpecification> collectedParameterSpecifications;
 		private readonly ICollection<NamedParameter> namedParameters;
-		private readonly ISet<string> subQuerySpaces = new HashSet<string>();
-
-		
+		private readonly ISet<string> subQuerySpaces = new HashSet<string>();
 
 		public CriteriaQueryTranslator(ISessionFactoryImplementor factory, CriteriaImpl criteria, string rootEntityName,
 									   string rootSQLAlias, ICriteriaQuery outerQuery)
@@ -187,7 +185,7 @@ public IType[] ProjectedTypes
 		public string[] ProjectedColumnAliases
 		{
 			get { return rootCriteria.Projection.GetColumnAliases(0, rootCriteria, this); }
-		}
+			}
 
 		public string[] ProjectedAliases
 		{
@@ -851,10 +849,10 @@ public string[] GetColumnAliasesUsingProjection(ICriteria subcriteria, string pr
 		}
 
 		#endregion
-		
+
 		private void CreateSubQuerySpaces()
 		{
-			
+
 			var subQueries =
 				rootCriteria.IterateExpressionEntries()
 				            .Select(x => x.Criterion)
@@ -871,21 +869,5 @@ private void CreateSubQuerySpaces()
 
 		}
 
-		private void GetSubQueries(CriteriaImpl criteriaImpl, List<CriteriaImpl> subQueries)
-		{
-			var subQueryExpressions =
-				criteriaImpl.IterateExpressionEntries().Select(x => x.Criterion).OfType<SubqueryExpression>().ToList();
-
-			foreach (var subqueryExpression in subQueryExpressions)
-			{
-				var impl = subqueryExpression.Criteria as CriteriaImpl;
-				if (impl != null)
-				{
-					subQueries.Add(impl);
-					GetSubQueries(impl, subQueries);
-				}
-			}
-
-		}
 	}
-}
+}