clean up after rebase

Author: amroel

src/NHibernate/Dialect/FirebirdDialect.cs

@@ -322,6 +322,11 @@ private void OverrideStandardHQLFunctions()
 			RegisterFunction("str", new SQLFunctionTemplate(NHibernateUtil.String, "cast(?1 as VARCHAR(255))"));
 			RegisterFunction("sysdate", new CastedFunction("today", NHibernateUtil.Date));
 			RegisterFunction("date", new SQLFunctionTemplate(NHibernateUtil.Date, "cast(?1 as date)"));
+			// Bitwise operations
+			RegisterFunction("band", new BitwiseFunctionOperation("bin_and"));
+			RegisterFunction("bor", new BitwiseFunctionOperation("bin_or"));
+			RegisterFunction("bxor", new BitwiseFunctionOperation("bin_xor"));
+			RegisterFunction("bnot", new BitwiseFunctionOperation("bin_not"));
 		}
 
 		private void RegisterFirebirdServerEmbeddedFunctions()

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 Hql.g 2014-08-11 17:12:33
+// $ANTLR 3.5.0.2 Hql.g 2014-11-15 07:40:13
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 Hql.g 2014-08-11 17:12:33
+// $ANTLR 3.5.0.2 Hql.g 2014-11-15 07:40:12
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 HqlSqlWalker.g 2014-08-11 17:12:34
+// $ANTLR 3.5.0.2 HqlSqlWalker.g 2014-11-15 07:40:14
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/SqlGenerator.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 SqlGenerator.g 2014-08-11 17:12:35
+// $ANTLR 3.5.0.2 SqlGenerator.g 2014-11-15 07:40:15
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs

@@ -487,9 +487,8 @@ public SqlString ToSqlString()
 				return builder.ToSqlString();
 			}
 
-	}
-
 			#endregion
+
 		}
 
 		#endregion

src/NHibernate/NHibernate.csproj

@@ -138,6 +138,7 @@
     <Compile Include="Connection\IConnectionProvider.cs" />
     <Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
     <Compile Include="Dialect\BitwiseFunctionOperation.cs" />
+    <Compile Include="Dialect\BitwiseNativeOperation.cs" />
     <Compile Include="Dialect\DB2Dialect.cs" />
     <Compile Include="Dialect\Dialect.cs" />
     <Compile Include="Dialect\FirebirdDialect.cs" />
@@ -157,7 +158,6 @@
     <Compile Include="Dialect\MySQL55InnoDBDialect.cs" />
     <Compile Include="Dialect\MySQL5InnoDBDialect.cs" />
     <Compile Include="Dialect\MySQLDialect.cs" />
-    <Compile Include="Dialect\NativeBitwiseOperation.cs" />
     <Compile Include="Dialect\PostgreSQLDialect.cs" />
     <Compile Include="Dialect\Schema\PostgreSQLMetadata.cs" />
     <Compile Include="Dialect\Schema\SchemaHelper.cs" />