From 1630ca1c49f42e8b14dccd77d1b39e5c9cacec44 Mon Sep 17 00:00:00 2001 From: Marco De Marco <demarco@oats.inaf.it> Date: Tue, 21 Jan 2014 14:34:37 +0100 Subject: [PATCH] Makefile modified, small changes --- Makefile | 24 ++++++++++++------------ src/Client.h | 4 ++-- src/DBManager.h | 2 +- src/FileWrapper.h | 2 +- src/PlainClient.h | 2 +- src/ProtocolManager.h | 2 +- src/SSLClient.h | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 89a9a6f..e27fc68 100644 --- a/Makefile +++ b/Makefile @@ -4,24 +4,24 @@ INST_NAME=test DEBUG_LEV=-v3 INSTALL_DIR=/usr/local/bin #================================================================================ -INC_DIR=/usr/local/omniORB-4.1.7/include \ - /usr/local/zeromq-3.2.3/include/zmq \ - /usr/local/tango-8.1.2/include/tango \ - /usr/local/soci-3.2.1/include \ - /usr/local/soci-3.2.1/include/soci \ +INC_DIR=/usr/local/omniORB/include \ + /usr/local/zeromq/include/zmq \ + /usr/local/tango/include/tango \ + /usr/local/soci/include \ + /usr/local/soci/include/soci \ /usr/include/mysql \ - /usr/local/protobuf-2.5.0/include \ + /usr/local/protobuf/include \ ./src -LIB_DIR=/usr/local/omniORB-4.1.7/lib \ - /usr/local/zeromq-3.2.3/lib \ - /usr/local/tango-8.1.2/lib \ - /usr/local/soci-3.2.1/lib64 \ - /usr/local/protobuf-2.5.0/lib +LIB_DIR=/usr/local/omniORB/lib \ + /usr/local/zeromq/lib \ + /usr/local/tango/lib \ + /usr/local/soci/lib64 \ + /usr/local/protobuf/lib #================================================================================ CC=g++ CXX_DEBUG_FLAGS=-g -DVERBOSE_DEBUG CXX_RELEASE_FLAGS=-O3 -CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++11 -std=gnu++11 +CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \ -lsoci_core -lsoci_mysql -lboost_system -lboost_thread -lboost_filesystem \ -lboost_date_time -lprotobuf -lssl diff --git a/src/Client.h b/src/Client.h index 4710251..bfb901e 100644 --- a/src/Client.h +++ b/src/Client.h @@ -173,7 +173,7 @@ protected: boost::asio::deadline_timer m_listsUpdateTimer; //Header size on binary stream - const unsigned HEADER_SIZE = 4; + static const unsigned HEADER_SIZE = 4; //Buffer for binary data read from stream std::vector<boost::uint8_t> m_readBuff; @@ -194,7 +194,7 @@ protected: std::string m_remoteEndpoint; //Read buffer size - const boost::uint64_t BUFFER_SIZE = 40960; + static const boost::uint64_t BUFFER_SIZE = 40960; //Buffer for file data read from stream std::vector<char> m_fileBuff; diff --git a/src/DBManager.h b/src/DBManager.h index 242db01..0103655 100644 --- a/src/DBManager.h +++ b/src/DBManager.h @@ -47,7 +47,7 @@ protected: virtual ~DBManager(); class Deleter; - friend Deleter; + friend class Deleter; class Deleter { public: diff --git a/src/FileWrapper.h b/src/FileWrapper.h index d8718ea..ba35402 100644 --- a/src/FileWrapper.h +++ b/src/FileWrapper.h @@ -26,7 +26,7 @@ protected: virtual ~FileWrapper(); class Deleter; - friend Deleter; + friend class Deleter; class Deleter { public: diff --git a/src/PlainClient.h b/src/PlainClient.h index d015c21..6b3b288 100644 --- a/src/PlainClient.h +++ b/src/PlainClient.h @@ -17,7 +17,7 @@ protected: virtual ~PlainClient(); class Deleter; - friend Deleter; + friend class Deleter; class Deleter { public: diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h index a005eba..cd8e679 100644 --- a/src/ProtocolManager.h +++ b/src/ProtocolManager.h @@ -37,7 +37,7 @@ protected: virtual ~ProtocolManager(); class Deleter; - friend Deleter; + friend class Deleter; class Deleter { public: diff --git a/src/SSLClient.h b/src/SSLClient.h index eaf7179..9b7a360 100644 --- a/src/SSLClient.h +++ b/src/SSLClient.h @@ -19,7 +19,7 @@ protected: virtual ~SSLClient(); class Deleter; - friend Deleter; + friend class Deleter; class Deleter { public: -- GitLab