Commit 9d99e74b authored by Marco De Marco's avatar Marco De Marco
Browse files

Makefile modified, minor changes

parent 73ee314a

Makefile

+15 −13
Original line number Diff line number Diff line
@@ -4,30 +4,32 @@ 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/boost/include \

	   /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/boost/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

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

PROTOC :=/usr/local/protobuf-2.5.0/bin/protoc

PROTOC :=/usr/local/protobuf/bin/protoc

#================================================================================

SRC_DIR=./src

OBJ_DIR=./obj

src/Client.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ protected: 
    boost::asio::deadline_timer m_requestResponseTimer;



    //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;

src/DBManager.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ protected: 
    virtual ~DBManager();



    class Deleter;

    friend Deleter;

    friend class Deleter;

    class Deleter

    {

        public:

src/PlainClient.cpp

+6 −3
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ void PlainClient::startConnect(boost::asio::ip::tcp::resolver::iterator endPoint 
{

    DEBUG_STREAM << "PlainClient::startConnect()" << endl;



    m_resetConnectionTimer.expires_from_now(boost::posix_time::seconds(30));

    m_resetConnectionTimer.expires_from_now(

	boost::posix_time::seconds(m_configuration_sp->getTimeout()));



    if(endPointIterator != boost::asio::ip::tcp::resolver::iterator())

    {
@@ -158,7 +159,8 @@ void PlainClient::startWriteRequest() 


        request_sp->SerializeToArray(&writeBuff[HEADER_SIZE], bodySize);



        m_resetConnectionTimer.expires_from_now(boost::posix_time::seconds(30));

        m_resetConnectionTimer.expires_from_now(

		boost::posix_time::seconds(m_configuration_sp->getTimeout()));



        boost::asio::async_write(m_plainSocket, boost::asio::buffer(writeBuff),

            boost::bind(&PlainClient::handleWriteRequest, this,
@@ -189,7 +191,8 @@ void PlainClient::startReadResponseHeader() 


    m_readBuff.resize(HEADER_SIZE);



    m_resetConnectionTimer.expires_from_now(boost::posix_time::seconds(30));

    m_resetConnectionTimer.expires_from_now(

	boost::posix_time::seconds(m_configuration_sp->getTimeout()));



    boost::asio::async_read(m_plainSocket, boost::asio::buffer(m_readBuff),

        boost::bind(&PlainClient::handleReadResponseHeader, this,

src/PlainClient.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ protected: 
    virtual ~PlainClient();



    class Deleter;

    friend Deleter;

    friend class Deleter;

    class Deleter

    {

        public: