Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,771 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

13 Commits

Author SHA1 Message Date
jsteemann 4a7c9f0f68 simplified bloated comments 2016-04-09 11:27:30 +02:00
Michael Hackstein f32750e1ac Removed obsolete toJson from AQL Nodes 2016-02-16 10:29:38 +01:00
Michael Hackstein f767636f14 Added a toVelocyPack serialisation to all Aql Nodes and their dependencies. Right now in parallel to toJson. 2016-02-16 00:04:32 +01:00
Wilfried Goesgens acc17daa96 Merge branch 'devel-solaris' of https://github.com/doublerebel/arangodb into doublerebel-devel-solaris 
Fix Conflicts:
	arangod/FulltextIndex/fulltext-index.cpp
	lib/Basics/logging.cpp
 2016-02-04 15:11:34 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Charles Phillips a846405545 fix,solaris: call of overloaded 'log(size_t&)' is ambiguous 
return depCost + nrItems * log(nrItems);
                                         ^
arangod/Aql/SortNode.cpp:196:41: note: candidates are:
In file included from /opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/math.h:47:0,
                 from ./lib/Basics/Common.h:62,
                 from arangod/Aql/SortNode.h:27,
                 from arangod/Aql/SortNode.cpp:24:
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:221:21: note: long double std::log(long double)
  inline long double log(long double __X) { return __logl(__X); }
                     ^
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:189:15: note: float std::log(float)
  inline float log(float __X) { return __logf(__X); }
               ^
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:89:15: note: double std::log(double)
 extern double log __P((double));
               ^
 2016-01-25 23:29:05 -08:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 2ae325fd4e removed some of those "using namespace" directives 2016-01-14 23:21:39 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
Jan Steemann 50fa5a2138 added SortNode file 2015-09-30 15:42:48 +02:00