From 7cd411b422750abf4eed04be43c43f310f55074f Mon Sep 17 00:00:00 2001
From: Constantin <jucovschi@gmail.com>
Date: Wed, 28 Apr 2010 10:30:32 +0200
Subject: added --enable-benchmark option to configure adapted code so that it
 compiles

---
 reladminif/adminifcommon.cc  | 1 +
 reladminif/databaseif.pgc    | 1 +
 reladminif/oidif.hh          | 5 ++++-
 reladminif/transactionif.pgc | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'reladminif')

diff --git a/reladminif/adminifcommon.cc b/reladminif/adminifcommon.cc
index f4409e3..29af5d8 100644
--- a/reladminif/adminifcommon.cc
+++ b/reladminif/adminifcommon.cc
@@ -41,6 +41,7 @@ rasdaman GmbH.
 
 #include "raslib/error.hh"
 #include "adminif.hh"
+#include "dbobject.hh"
 
 #include "raslib/rmdebug.hh"
 #include "sqlerror.hh"
diff --git a/reladminif/databaseif.pgc b/reladminif/databaseif.pgc
index cec18c5..ddd3937 100644
--- a/reladminif/databaseif.pgc
+++ b/reladminif/databaseif.pgc
@@ -97,6 +97,7 @@ struct connection
 #include "sqlerror.hh"
 #include "oidif.hh"
 #include "adminif.hh"
+#include "dbobject.hh"
 
 extern char globalConnectId[256];
 // size of ARCHITECTURE attribute in RAS_ADMIN:
diff --git a/reladminif/oidif.hh b/reladminif/oidif.hh
index 33ce760..7444ec9 100644
--- a/reladminif/oidif.hh
+++ b/reladminif/oidif.hh
@@ -184,6 +184,10 @@ class OId
 
 		bool operator>= (const OId& old) const;
 
+             #ifdef RMANBENCHMARK
+	        static RMTimer oidAlloc;
+	        static RMTimer oidResolve;
+	     #endif
 	protected:
 		// protection agains writing back unloaded counters => inconsistent DB!!
 		static bool loadedOk;
@@ -293,7 +297,6 @@ class OId
 		/*@Doc: 
 		holds all OIdCounters of next* sort, to go with the counterNames.
 		*/
-
 	};
 
 extern std::ostream& operator<<(std::ostream& in, const OId& d);
diff --git a/reladminif/transactionif.pgc b/reladminif/transactionif.pgc
index 6bd16f7..4dbbc8a 100644
--- a/reladminif/transactionif.pgc
+++ b/reladminif/transactionif.pgc
@@ -47,6 +47,7 @@ EXEC SQL include sqlglobals.h;
 #include "sqlerror.hh"
 #include "objectbroker.hh"
 #include "databaseif.hh"
+#include "dbobject.hh"
 
 // PG stuff for libpg connection maintenance
 #include "libpq-fe.h"
-- 
cgit