Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed comparison

This commit is contained in:
Frank Celler 2016-01-05 12:36:53 +01:00
parent 1b25f98996
commit 6fbe632d08
3 changed files with 380 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

742
arangod/Aql/grammar.cpp
View File

File diff suppressed because it is too large Load Diff

12
arangod/Aql/grammar.h
View File

@ -1,8 +1,8 @@
/* A Bison parser, made by GNU Bison 3.0.2. */
/* A Bison parser, made by GNU Bison 3.0.4. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -116,10 +116,10 @@ extern int Aqldebug;
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE YYSTYPE;
union YYSTYPE
{
#line 17 "arangod/Aql/grammar.y" /* yacc.c:1909 */
#line 17 "arangod/Aql/grammar.y" /* yacc.c:1915 */
triagens::aql::AstNode* node;
struct {
@ -129,8 +129,10 @@ union YYSTYPE
bool boolval;
int64_t intval;
#line 133 "arangod/Aql/grammar.hpp" /* yacc.c:1909 */
#line 133 "arangod/Aql/grammar.hpp" /* yacc.c:1915 */
};
typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
#endif

2
arangod/VocBase/collection.cpp
View File

@ -1129,7 +1129,7 @@ VocbaseCollectionInfo::VocbaseCollectionInfo (TRI_vocbase_t* vocbase,
memset(_name, 0, sizeof(_name));
if (name != '\0') {
if (name != nullptr && *name != '\0') {
TRI_CopyString(_name, name, sizeof(_name) - 1);
}