Correction of bug when pyobj hides a pystring with foreach node.

[modules/yacs.git] / src / runtime / TypeConversions.cxx

diff --git a/src/runtime/TypeConversions.cxx b/src/runtime/TypeConversions.cxx
index 9e6dddf98d86bb1369045ecfed3d38f41e715aff..740fe72a409769cf8795598959d939bb053dcd54 100644 (file)
--- a/src/runtime/TypeConversions.cxx
+++ b/src/runtime/TypeConversions.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -37,7 +37,7 @@
 #include <iostream>
 #include <sstream>
 
-#ifdef WNT
+#ifdef WIN32
 #include <fcntl.h>
 #define _S_IREAD 256
 #define _S_IWRITE 128
@@ -774,7 +774,7 @@ namespace YACS
     {
       static inline std::string convert(const TypeCode *t,PyObject* o,void*,int protocol)
         {
-          if (PyString_Check(o))
+          if (PyString_Check(o) && strncmp(t->id(),"python",6)!=0)
             {
               // the objref is used by Python as a string (prefix:value) keep it as a string
               return PyString_AS_STRING(o);