|
From: <asf...@us...> - 2010-10-27 00:33:04
|
Revision: 51780
http://firebird.svn.sourceforge.net/firebird/?rev=51780&view=rev
Author: asfernandes
Date: 2010-10-27 00:32:58 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
Misc
Modified Paths:
--------------
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/src/common/classes/fb_atomic.h
firebird/trunk/src/dsql/ExprNodes.cpp
firebird/trunk/src/dsql/pass1.cpp
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2010-10-26 23:34:46 UTC (rev 51779)
+++ firebird/trunk/builds/posix/Makefile.in 2010-10-27 00:32:58 UTC (rev 51780)
@@ -420,7 +420,7 @@
#---------------------------------------------------------------------------
-# This target builds the include files for disttribution with the release
+# This target builds the include files for distribution with the release
# Some of the files differ from the ones used internally to compile the
# software - mainly they are just flattened out to make the view simpler
# from an external point of view.
@@ -432,7 +432,7 @@
# ib_util.h actually is a marker for a number of headers
-# All these files are #includes in ibase.h here we cat them all together
+# All these files are #included in ibase.h. Here we cat them all together
# and remove the embedded #includes to make it simpler for external usage.
IBASE_ExtraFiles = include/types_pub.h include/consts_pub.h dsql/sqlda_pub.h common/dsc_pub.h jrd/ibase.h jrd/inf_pub.h jrd/blr.h include/gen/iberror.h
@@ -446,12 +446,12 @@
$(MAKE_HEADER_Bin) <ibase.h >$@
$(RM) -f ibase.h
-# Copy all the other headers to the distribution directory. we use
+# Copy all the other headers to the distribution directory. We use
# ib_util.h as the marker for all the files.
OtherDistribHeaders = extlib/ib_util.h \
- yvalve/perf.h \
- include/gen/iberror.h
+ yvalve/perf.h \
+ include/gen/iberror.h
SRC_OtherDistribHeaders = $(addprefix $(SRC_ROOT)/, $(OtherDistribHeaders))
@@ -461,7 +461,7 @@
# There are also gds*f and gds*ada header files around if someone
-# wants them. You might need to hunt around in the old cvs tree for them.
+# wants them. You might need to hunt around in the old cvs tree for them.
#___________________________________________________________________________
# track dependencies
Modified: firebird/trunk/src/common/classes/fb_atomic.h
===================================================================
--- firebird/trunk/src/common/classes/fb_atomic.h 2010-10-26 23:34:46 UTC (rev 51779)
+++ firebird/trunk/src/common/classes/fb_atomic.h 2010-10-27 00:32:58 UTC (rev 51780)
@@ -440,7 +440,7 @@
extern "C" {
#define AO_REQUIRE_CAS
#include <atomic_ops.h>
-};
+}
namespace Firebird {
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp 2010-10-26 23:34:46 UTC (rev 51779)
+++ firebird/trunk/src/dsql/ExprNodes.cpp 2010-10-27 00:32:58 UTC (rev 51780)
@@ -4400,7 +4400,7 @@
if (ExprNode::is<NullNode>(dsqlArg))
{
- // NULL + NULL = NULL of INT
+ // -NULL = NULL of INT
desc->makeLong(0);
desc->setNullable(true);
}
Modified: firebird/trunk/src/dsql/pass1.cpp
===================================================================
--- firebird/trunk/src/dsql/pass1.cpp 2010-10-26 23:34:46 UTC (rev 51779)
+++ firebird/trunk/src/dsql/pass1.cpp 2010-10-27 00:32:58 UTC (rev 51780)
@@ -4611,7 +4611,7 @@
{
const ULONG position = literal->getSlong();
- if ((position < 1) || !selectList || (position > (ULONG) selectList->nod_count))
+ if (position < 1 || !selectList || position > (ULONG) selectList->nod_count)
{
// Invalid column position used in the GROUP BY clause
ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|