From 61015c247ecafb72f9ecf1b59ebc5da222c7198f Mon Sep 17 00:00:00 2001
From: Marco De Marco <demarco@oats.inaf.it>
Date: Tue, 21 Jan 2014 14:32:04 +0100
Subject: [PATCH] Makefile modified, minor changes

---
 Makefile              | 26 +++++++++++++-------------
 src/DBManager.h       |  2 +-
 src/FileWrapper.h     |  2 +-
 src/PlainServer.h     |  2 +-
 src/PlainSession.h    |  2 +-
 src/ProtocolManager.h |  2 +-
 src/SSLServer.h       |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index e81b3fc..2227865 100644
--- a/Makefile
+++ b/Makefile
@@ -4,30 +4,30 @@ 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-mt -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
diff --git a/src/DBManager.h b/src/DBManager.h
index 4315538..798cd6a 100644
--- a/src/DBManager.h
+++ b/src/DBManager.h
@@ -41,7 +41,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 cbc5b23..35ffd9e 100644
--- a/src/FileWrapper.h
+++ b/src/FileWrapper.h
@@ -27,7 +27,7 @@ protected:
     virtual ~FileWrapper();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
         public:
diff --git a/src/PlainServer.h b/src/PlainServer.h
index f3655b6..5a92b27 100644
--- a/src/PlainServer.h
+++ b/src/PlainServer.h
@@ -17,7 +17,7 @@ class PlainServer : public Server
     virtual ~PlainServer();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
 	public:
diff --git a/src/PlainSession.h b/src/PlainSession.h
index a0fa74a..7e7839e 100644
--- a/src/PlainSession.h
+++ b/src/PlainSession.h
@@ -23,7 +23,7 @@ protected:
     virtual ~PlainSession();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
 	public:
diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h
index e8da5e6..315778d 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/SSLServer.h b/src/SSLServer.h
index db74b71..c10dcc8 100644
--- a/src/SSLServer.h
+++ b/src/SSLServer.h
@@ -19,7 +19,7 @@ class SSLServer : public Server
     virtual ~SSLServer();
 
     class Deleter;
-    friend Deleter;
+    friend class Deleter;
     class Deleter
     {
 	public:
-- 
GitLab