You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by ve...@apache.org on 2013/05/15 10:31:34 UTC
svn commit: r1482721 - in /etch/trunk:
binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
examples/helloworld/cpp/CMakeLists.txt
Author: veithm
Date: Wed May 15 08:31:34 2013
New Revision: 1482721
URL: http://svn.apache.org/r1482721
Log:
ETCH-272 Fixing code generation error
Fixing code generation when dealing with hashtables
Change-Id: I1aae4bba5f6c4335b536990084d96a87c4b02e64
Modified:
etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
etch/trunk/examples/helloworld/cpp/CMakeLists.txt
Modified: etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1482721&r1=1482720&r2=1482721&view=diff
==============================================================================
--- etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm (original)
+++ etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm Wed May 15 08:31:34 2013
@@ -138,9 +138,9 @@ public:
// there should only be a single key, so take the first one
EtchHashTable<EtchField, capu::SmartPointer<EtchObject> >::Iterator it = value->begin();
- EtchHashTable<EtchField, capu::SmartPointer<EtchObject> >::Pair pair;
- it.next(&pair);
- EtchField key = pair.first;
+ EtchHashTable<EtchField, capu::SmartPointer<EtchObject> >::HashTableEntry entry;
+ it.next(&entry);
+ EtchField key = entry.key;
#foreach ($p in $n.iterator())
if (key.equals(&$vf::$p.vname($helper)()))
{
Modified: etch/trunk/examples/helloworld/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/etch/trunk/examples/helloworld/cpp/CMakeLists.txt?rev=1482721&r1=1482720&r2=1482721&view=diff
==============================================================================
--- etch/trunk/examples/helloworld/cpp/CMakeLists.txt (original)
+++ etch/trunk/examples/helloworld/cpp/CMakeLists.txt Wed May 15 08:31:34 2013
@@ -1,17 +1,14 @@
#
-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to you under the Apache License, Version
# 2.0 (the "License"); you may not use this file except in compliance
-
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and