svn commit: r1757164 - in /lucene/pylucene/trunk/jcc/jcc/sources: JCCEnv.cpp functions.h

[va...@apache.org]

Author: vajda
Date: Mon Aug 22 13:33:20 2016
New Revision: 1757164

URL: http://svn.apache.org/viewvc?rev=1757164&view=rev
Log:
fixed some compiler warnings

Modified:
    lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp
    lucene/pylucene/trunk/jcc/jcc/sources/functions.h

Modified: lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp?rev=1757164&r1=1757163&r2=1757164&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/JCCEnv.cpp Mon Aug 22 13:33:20 2016
@@ -1016,7 +1016,7 @@ jstring JCCEnv::fromPyString(PyObject *o
                 jchars[i] = (jchar) pchars[i];
 
             str = get_vm_env()->NewString(jchars, len);
-            delete jchars;
+            delete[] jchars;
 
             return str;
         }

Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.h?rev=1757164&r1=1757163&r2=1757164&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.h Mon Aug 22 13:33:20 2016
@@ -131,7 +131,7 @@ template<class T> PyObject *get_iterator
 #ifdef _java_generics
 template<class T> PyObject *get_generic_iterator(T *self)
 {
-    PyTypeObject *param = self->parameters ? self->parameters[0] : NULL;
+    PyTypeObject *param = self->parameters[0];
     jobject iterator;
 
     OBJ_CALL(iterator = env->iterator(self->object.this$));
@@ -177,7 +177,7 @@ template<class T, class U> PyObject *get
     if (env->get_vm_env()->IsInstanceOf(next, cls))
         return env->fromJString((jstring) next, 1);
 
-    PyTypeObject *param = self->parameters ? self->parameters[0] : NULL;
+    PyTypeObject *param = self->parameters[0];
     if (param != NULL)
         return wrapType(param, next);
 
@@ -223,7 +223,7 @@ template<class T, class U> PyObject *get
     if (env->get_vm_env()->IsInstanceOf(next, cls))
         return env->fromJString((jstring) next, 1);
 
-    PyTypeObject *param = self->parameters ? self->parameters[0] : NULL;
+    PyTypeObject *param = self->parameters[0];
     if (param != NULL)
         return wrapType(param, next);
 
@@ -263,7 +263,7 @@ template<class T, class U, class V> PyOb
     if (env->get_vm_env()->IsInstanceOf(next.this$, cls))
         return env->fromJString((jstring) next.this$, 0);
 
-    PyTypeObject *param = self->parameters ? self->parameters[0] : NULL;
+    PyTypeObject *param = self->parameters[0];
     if (param != NULL)
         return wrapType(param, next.this$);