Fix for attribute filtering on windows

Author: Arthoni

src/openfluid/tools/IDHelpers.cpp

@@ -58,16 +58,6 @@ std::string classIDToString(const openfluid::core::UnitsClass_t& Class, openflui
 // =====================================================================
 
 
-bool isNonEmpty(const std::string& Str)
-{
-  return Str.length() > 0;
-}
-
-
-// =====================================================================
-// =====================================================================
-
-
 bool isValidAlphaNumName(const std::string& Name)
 {
   // authorized chars: a to z, A to Z, 0 to 9

src/openfluid/tools/IDHelpers.hpp

@@ -86,14 +86,6 @@ constexpr auto UnitsClassNameRuleString("^[^;:#]+$");
 std::string OPENFLUID_API classIDToString(const openfluid::core::UnitsClass_t& Class, openfluid::core::UnitID_t ID);
 
 
-/**
-  Checks whether a string is empty
-  @param[in] Str the string to check
-  @return true if the string is not empty
-*/
-bool OPENFLUID_API isNonEmpty(const std::string& Str);
-
-
 /**
   Checks whether an alphanumeric name is valid or not.\n
   To be valid, a name must only contain alphanumeric characters.

src/openfluid/ware/CMakeLists.txt

@@ -9,7 +9,7 @@ SET(OPENFLUID_WARE_CPP WareIssues.cpp WareSignature.cpp
 SET(OPENFLUID_WARE_HPP WareIssues.hpp WareSignature.hpp SimulatorSignature.hpp ObserverSignature.hpp
                        PluggableWare.hpp SimulationDrivenWare.hpp SimulationInspectorWare.hpp SimulationContributorWare.hpp
                        PluggableSimulator.hpp PluggableObserver.hpp                       
-                       TypeDefs.hpp
+                       TypeDefs.hpp DataItemUtils.hpp
                        LoopMacros.hpp ThreadedLoopMacros.hpp
                        WareException.hpp
                        WareRNG.hpp

src/openfluid/ware/DataItemUtils.hpp

@@ -0,0 +1,81 @@
+/*
+
+  This file is part of OpenFLUID software
+  Copyright(c) 2007, INRA - Montpellier SupAgro
+
+
+ == GNU General Public License Usage ==
+
+  OpenFLUID is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OpenFLUID is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OpenFLUID. If not, see <http://www.gnu.org/licenses/>.
+
+
+ == Other Usage ==
+
+  Other Usage means a use of OpenFLUID that is inconsistent with the GPL
+  license, and requires a written agreement between You and INRA.
+  Licensees for Other Usage of OpenFLUID may use this file in accordance
+  with the terms contained in the written agreement between You and INRA.
+  
+*/
+
+
+/**
+  @file DataItemUtils.hpp
+
+  @author Armel THÖNI <armel.thoni@inrae.fr>
+*/
+
+#pragma once
+
+
+#include <string>
+
+#include <openfluid/dllexport.hpp>
+
+
+namespace openfluid { namespace ware {
+
+// contains minimal functions used by signature data item constructors
+
+
+/**
+  Transmits a given variable name to container without changing type
+  @param[in] VO the string to use
+  @param[in] V the string to populate
+  @param[in] T the type to change (ignored)
+  @return true always
+*/
+inline bool OPENFLUID_API identityExtractor(const std::string& VO, std::string& V, openfluid::core::Value::Type&  /*T*/)
+{
+  V = VO;
+  return true;
+}
+
+
+// =====================================================================
+// =====================================================================
+
+
+/**
+  Checks whether a string is empty
+  @param[in] Str the string to check
+  @return true if the string is not empty
+*/
+inline bool OPENFLUID_API isNonEmpty(const std::string& Str)
+{
+  return Str.length() > 0;
+}
+
+
+} } // namespaces

src/openfluid/ware/WareSignature.cpp

@@ -42,8 +42,6 @@
 #include <openfluid/config.hpp>
 #include <openfluid/ware/TypeDefs.hpp>
 #include <openfluid/ware/WareIssues.hpp>
-#include <openfluid/tools/MiscHelpers.hpp>
-#include <openfluid/tools/StringHelpers.hpp>
 #include <openfluid/ware/WareSignature.hpp>
 
 

src/openfluid/ware/WareSignature.hpp

@@ -40,6 +40,7 @@
 #include <openfluid/dllexport.hpp>
 #include <openfluid/config.hpp>
 #include <openfluid/ware/TypeDefs.hpp>
+#include <openfluid/ware/DataItemUtils.hpp>
 #include <openfluid/ware/WareIssues.hpp>
 #include <openfluid/tools/MiscHelpers.hpp>
 #include <openfluid/tools/IDHelpers.hpp>
@@ -227,24 +228,6 @@ class OPENFLUID_API WareSignature
 // =====================================================================
 
 
-/**
-  Transmits a given variable name to container without changing type
-  @param[in] VO the string to use
-  @param[in] V the string to populate
-  @param[in] T the type to change (ignored)
-  @return true always
-*/
-static bool identityExtractor(const std::string& VO, std::string& V, openfluid::core::Value::Type&  /*T*/)
-{
-  V = VO;
-  return true;
-}
-
-
-// =====================================================================
-// =====================================================================
-
-
 /**
 Class for storage of the definition of data handled by the simulator.
 */
@@ -262,10 +245,10 @@ class OPENFLUID_API SignatureDataItem
 
     SignatureDataItem(const std::string& N, const std::string& D, const std::string& SI, 
       std::function<bool(const std::string&,std::string&,
-        openfluid::core::Value::Type&)> Extractor=identityExtractor);
+        openfluid::core::Value::Type&)> Extractor=openfluid::ware::identityExtractor);
 
     SignatureDataItem(const std::string& N, const std::string& D, const std::string& SI,
-      openfluid::core::Value::Type T, std::function<bool(const std::string&)> Validator=openfluid::tools::isNonEmpty);
+      openfluid::core::Value::Type T, std::function<bool(const std::string&)> Validator=openfluid::ware::isNonEmpty);
 };
 
 
@@ -288,13 +271,13 @@ class OPENFLUID_API SignatureSpatialDataItem : public SignatureDataItem
     SignatureSpatialDataItem(const std::string& N, const openfluid::core::UnitsClass_t& U,
                              const std::string& D, const std::string& SI, 
                              std::function<bool(const std::string&,std::string&,
-                               openfluid::core::Value::Type&)> Extractor=identityExtractor):
+                               openfluid::core::Value::Type&)> Extractor=openfluid::ware::identityExtractor):
       SignatureDataItem(N,D,SI,Extractor),UnitsClass(U)
     { }
 
     SignatureSpatialDataItem(const std::string& N, const openfluid::core::UnitsClass_t& U,
                              const std::string& D, const std::string& SI, openfluid::core::Value::Type T, 
-                             std::function<bool(const std::string&)> Validator=openfluid::tools::isNonEmpty):
+                             std::function<bool(const std::string&)> Validator=openfluid::ware::isNonEmpty):
       SignatureDataItem(N,D,SI,T,Validator),UnitsClass(U)
     { }
 };

src/openfluid/waresdev/WareCppWriterHelpers.hpp

@@ -48,6 +48,7 @@
 #include <openfluid/dllexport.hpp>
 #include <openfluid/tools/IDHelpers.hpp>
 #include <openfluid/ware/TypeDefs.hpp>
+#include <openfluid/ware/DataItemUtils.hpp>
 #include <openfluid/ware/WareSignature.hpp>
 #include <openfluid/waresdev/WareSignatureSerializer.hpp>
 
@@ -333,7 +334,7 @@ struct DataJsonConverter
 {
 
   static openfluid::ware::SignatureDataItem readDataItemFromJSON(const openfluid::thirdparty::json& Item, 
-    std::function<bool(const std::string&)> Validator=openfluid::tools::isNonEmpty)
+    std::function<bool(const std::string&)> Validator=openfluid::ware::isNonEmpty)
   {
     openfluid::ware::SignatureDataItem Data;
 
@@ -553,7 +554,7 @@ struct DataJsonConverter
 
 
   static openfluid::ware::SignatureSpatialDataItem readSpatialDataItemFromJSON(const openfluid::thirdparty::json& Item, 
-    std::function<bool(const std::string&)> Validator=openfluid::tools::isNonEmpty)
+    std::function<bool(const std::string&)> Validator=openfluid::ware::isNonEmpty)
   {
     openfluid::ware::SignatureSpatialDataItem Data;
 
@@ -590,7 +591,7 @@ struct DataJsonConverter
 
   static std::vector<openfluid::ware::SignatureSpatialDataItem> 
   readSpatialDataListFromJSON(const openfluid::thirdparty::json& Json, 
-    std::function<bool(const std::string&)> Validator=openfluid::tools::isNonEmpty)
+    std::function<bool(const std::string&)> Validator=openfluid::ware::isNonEmpty)
   {
     std::vector<openfluid::ware::SignatureSpatialDataItem> List;