You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by sb...@apache.org on 2010/02/19 20:21:01 UTC
svn commit: r911945 - in /hadoop/avro/trunk: CHANGES.txt
lang/c++/Makefile.am lang/c++/build.sh lang/c++/impl/Validator.cc
lang/c++/parser/AvroLex.ll lang/c++/parser/AvroYacc.yy
Author: sbanacho
Date: Fri Feb 19 19:21:01 2010
New Revision: 911945
URL: http://svn.apache.org/viewvc?rev=911945&view=rev
Log:
AVRO-422. Build c++ docs in correct location.
Modified:
hadoop/avro/trunk/CHANGES.txt
hadoop/avro/trunk/lang/c++/Makefile.am
hadoop/avro/trunk/lang/c++/build.sh
hadoop/avro/trunk/lang/c++/impl/Validator.cc
hadoop/avro/trunk/lang/c++/parser/AvroLex.ll
hadoop/avro/trunk/lang/c++/parser/AvroYacc.yy
Modified: hadoop/avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=911945&r1=911944&r2=911945&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Fri Feb 19 19:21:01 2010
@@ -489,6 +489,8 @@
AVRO-421. Fix some dist target issues. (cutting)
+ AVRO-422. Build c++ docs in correct location. (sbanacho)
+
Avro 1.2.0 (14 October 2009)
INCOMPATIBLE CHANGES
Modified: hadoop/avro/trunk/lang/c++/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c%2B%2B/Makefile.am?rev=911945&r1=911944&r2=911945&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c++/Makefile.am (original)
+++ hadoop/avro/trunk/lang/c++/Makefile.am Fri Feb 19 19:21:01 2010
@@ -133,7 +133,7 @@
bigrecord2.precompile: $(top_srcdir)/jsonschemas/bigrecord2 precompile$(EXEEXT)
$(top_builddir)/precompile$(EXEEXT) < $< > $@
-DOXYGEN_INPUTS= $(top_srcdir)/MainPage.dox $(library_include_HEADERS)
+DOXYGEN_INPUTS= $(top_srcdir)/MainPage.dox $(patsubst %,$(top_srcdir)/%, $(library_include_HEADERS))
CPP_DOC_DIR ?= "$(top_builddir)/doc"
Modified: hadoop/avro/trunk/lang/c++/build.sh
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c%2B%2B/build.sh?rev=911945&r1=911944&r2=911945&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c++/build.sh (original)
+++ hadoop/avro/trunk/lang/c++/build.sh Fri Feb 19 19:21:01 2010
@@ -34,7 +34,7 @@
root_dir=$(pwd)
build_dir="../../build/avro-cpp-$VERSION"
dist_dir="../../dist"
-doc_dir="../../build/avro-doc-$VERSION/api/cpp"
+doc_dir="../../build/avro-doc-$VERSION/api/cpp/html"
tarfile=avro-cpp-$VERSION.tar.gz
Modified: hadoop/avro/trunk/lang/c++/impl/Validator.cc
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c%2B%2B/impl/Validator.cc?rev=911945&r1=911944&r2=911945&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c++/impl/Validator.cc (original)
+++ hadoop/avro/trunk/lang/c++/impl/Validator.cc Fri Feb 19 19:21:01 2010
@@ -291,7 +291,7 @@
if(idx >= 0 && compoundStack_[idx].node->type() == AVRO_RECORD) {
size_t pos = compoundStack_[idx].pos-1;
const NodePtr &node = compoundStack_[idx].node;
- if(pos>= 0 && pos < node->leaves()) {
+ if(pos < node->leaves()) {
name = node->nameAt(pos);
found = true;
}
Modified: hadoop/avro/trunk/lang/c++/parser/AvroLex.ll
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c%2B%2B/parser/AvroLex.ll?rev=911945&r1=911944&r2=911945&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c++/parser/AvroLex.ll (original)
+++ hadoop/avro/trunk/lang/c++/parser/AvroLex.ll Fri Feb 19 19:21:01 2010
@@ -17,6 +17,11 @@
limitations under the License.
*/
+// on some systems, won't find an EOF definition
+#ifndef EOF
+#define EOF (-1)
+#endif
+
#include "AvroYacc.h"
// this undef is a hack for my mac implementation
Modified: hadoop/avro/trunk/lang/c++/parser/AvroYacc.yy
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/lang/c%2B%2B/parser/AvroYacc.yy?rev=911945&r1=911944&r2=911945&view=diff
==============================================================================
--- hadoop/avro/trunk/lang/c++/parser/AvroYacc.yy (original)
+++ hadoop/avro/trunk/lang/c++/parser/AvroYacc.yy Fri Feb 19 19:21:01 2010
@@ -17,7 +17,6 @@
limitations under the License.
*/
-#include <stdio.h>
#include <boost/format.hpp>
#include "Compiler.hh"
#include "Exception.hh"