From 7952f02ac2c74e8f2aad464549abf11382e75091 Mon Sep 17 00:00:00 2001 From: junfeng Date: Tue, 19 Mar 2013 12:44:58 +0800 Subject: [PATCH] Added unistd.h for GCC 4.7 compatibility. Change-Id: I181312dfcc6f8375bc85c26fa63bca29aaa716c8 --- modules/certificate_dao/dao/certificate_dao.cpp | 4 ++++ modules/security_origin_dao/dao/security_origin_dao.cpp | 1 + modules/utils/src/path.cpp | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/certificate_dao/dao/certificate_dao.cpp b/modules/certificate_dao/dao/certificate_dao.cpp index 4f1a719..5bcd6e7 100755 --- a/modules/certificate_dao/dao/certificate_dao.cpp +++ b/modules/certificate_dao/dao/certificate_dao.cpp @@ -32,6 +32,10 @@ #include #include #include +/* GCC versions 4.7 had changes to the C++ standard. It + * no longer includes to remove namespace pollution. + */ +#include using namespace DPL::DB::ORM; using namespace DPL::DB::ORM::certificate; diff --git a/modules/security_origin_dao/dao/security_origin_dao.cpp b/modules/security_origin_dao/dao/security_origin_dao.cpp index 746e61c..f3c4740 100755 --- a/modules/security_origin_dao/dao/security_origin_dao.cpp +++ b/modules/security_origin_dao/dao/security_origin_dao.cpp @@ -32,6 +32,7 @@ #include #include #include +#include using namespace DPL::DB::ORM; using namespace DPL::DB::ORM::security_origin; diff --git a/modules/utils/src/path.cpp b/modules/utils/src/path.cpp index 5ce44a1..6590e19 100644 --- a/modules/utils/src/path.cpp +++ b/modules/utils/src/path.cpp @@ -28,7 +28,7 @@ #include #include #include - +#include #include namespace DPL { -- 2.7.4