resource: Include functional header for g++-7.1.0 67/21067/3
authorPhilippe Coval <philippe.coval@osg.samsung.com>
Wed, 28 Jun 2017 02:54:05 +0000 (04:54 +0200)
committerPhil Coval <philippe.coval@osg.samsung.com>
Wed, 28 Jun 2017 10:58:36 +0000 (10:58 +0000)
It was tested on yocto poky master on iotivity-1.2.1 (and later):

  resource/include/OCUtilities.h: \
  In function 'OCStackResult OC::nil_guard(PtrT&&, FnT&&, ParamTs&& ...)':
  resource/include/OCUtilities.h:85:21: \
  error: 'bind' is not a member of 'std'
  return std::bind(fn, p, std::ref(params)...)();

  resource/include/OCApi.h: At global scope:
  resource/include/OCApi.h:362:18: \
  error: 'function' in namespace 'std' does not name a template type
  typedef std::function<void(std::shared_ptr<OCResource>)> FindCallback;

Change-Id: Ie1cab497c33fde394f77490a1d636eb36a563396
Origin: https://gerrit.iotivity.org/gerrit/#/c/21069/
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21067
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
resource/include/OCApi.h
resource/include/OCUtilities.h

index 4e14f29..af97215 100644 (file)
@@ -27,9 +27,7 @@
 #include <map>
 #include <memory>
 #include <iterator>
-#if defined(_MSC_VER)
 #include <functional>
-#endif
 
 #include "iotivity_config.h"
 #include "iotivity_debug.h"
index 85039d0..f1c9304 100644 (file)
@@ -26,6 +26,7 @@
 #include <memory>
 #include <utility>
 #include <exception>
+#include <functional>
 
 #include <OCException.h>
 #include <StringConstants.h>