From dcaa43956bcc75548ed2b5ad7a375fdb5e6e7909 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 11 Aug 2016 21:02:24 +0200
Subject: [PATCH] 'Comply with ATLAS naming conventions.'
(ByteStreamCnvSvcLegacy-00-00-06)
2016-08-11 scott snyder <snyder@bnl.gov>
* Tagging ByteStreamCnvSvcLegacy-00-00-06.
* Comply with ATLAS naming conventions.
* Tagging ByteStreamCnvSvcLegacy-00-00-05.
* Fix #include directive.
* Fix ChangeLog name.
2016-06-22 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Explicitly linking the library against boost_system with
CMake. Since tdaq-common pulls in that dependency.
* Tagging as ByteStreamCnvSvcLegacy-00-00-04
2016-03-24 Andy Salnikov <salnikov@slac.stanford.edu>
* Fix for compilation warning in v5_Guid.cxx
* Tagging as ByteStreamCnvSvcLegacy-00-00-03
2016-03-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Added a hand-written CMakeLists.txt file to the package that builds
it correctly in the CMake nightly.
...
(Long ChangeLog diff - truncated)
---
.../offline_EventStorage/v5_DataWriter.h | 2 +-
Event/ByteStreamCnvSvcLegacy/Changelog | 18 ------------------
.../src/offline_EventStorage/v5_DataBuffer.cxx | 14 +++++++-------
.../src/offline_EventStorage/v5_DataBuffer.h | 4 ++--
.../src/offline_EventStorage/v5_DataWriter.cxx | 16 ++++++++--------
5 files changed, 18 insertions(+), 36 deletions(-)
delete mode 100644 Event/ByteStreamCnvSvcLegacy/Changelog
diff --git a/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h b/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h
index 2c4d3e64653..705d5240f93 100644
--- a/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h
+++ b/Event/ByteStreamCnvSvcLegacy/ByteStreamCnvSvcLegacy/offline_EventStorage/v5_DataWriter.h
@@ -334,7 +334,7 @@ public:
int64_t m_latestPosition; // offset of the latest written event
- EventStorage::DataWriterCallBack *mp_callBack; // pointer to call-back, for reporting file names
+ EventStorage::DataWriterCallBack *m_callBack; // pointer to call-back, for reporting file names
freeMetaDataStrings m_fmdStrings; // optional vector of strings, not written out if empty
diff --git a/Event/ByteStreamCnvSvcLegacy/Changelog b/Event/ByteStreamCnvSvcLegacy/Changelog
deleted file mode 100644
index 5374fcfe222..00000000000
--- a/Event/ByteStreamCnvSvcLegacy/Changelog
+++ /dev/null
@@ -1,18 +0,0 @@
-2016-06-22 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- * Explicitly linking the library against boost_system with
- CMake. Since tdaq-common pulls in that dependency.
- * Tagging as ByteStreamCnvSvcLegacy-00-00-04
-
-2016-03-24 Andy Salnikov <salnikov@slac.stanford.edu>
- * Fix for compilation warning in v5_Guid.cxx
- * Tagging as ByteStreamCnvSvcLegacy-00-00-03
-
-2016-03-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
- * Added a hand-written CMakeLists.txt file to the package that builds
- it correctly in the CMake nightly.
- * Removed the executable flag from all files of the package.
- * Tagging as ByteStreamCnvSvcLegacy-00-00-02
-
-2016-03-16 Jack Cranshaw <cranshaw@anl.gov>
- * ByteStreamCnvSvcLegacy-00-00-01
- * First version
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx
index fd402a1a8bc..7ca884a85fa 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.cxx
@@ -59,24 +59,24 @@ private:
};
offline_EventStorage_v5::DataBuffer::DataBuffer():
- rep(new implementation())
+ m_rep(new implementation())
{}
offline_EventStorage_v5::DataBuffer::DataBuffer(const uint32_t& size):
- rep(new implementation(size))
+ m_rep(new implementation(size))
{}
offline_EventStorage_v5::DataBuffer::~DataBuffer()
-{ delete rep; }
+{ delete m_rep; }
void offline_EventStorage_v5::DataBuffer::realloc(const uint32_t& newsize)
-{ return rep->realloc(newsize); }
+{ return m_rep->realloc(newsize); }
void offline_EventStorage_v5::DataBuffer::grow(const uint32_t& newsize)
-{ return rep->grow(newsize); }
+{ return m_rep->grow(newsize); }
void* offline_EventStorage_v5::DataBuffer::handle()
-{ return rep->handle(); }
+{ return m_rep->handle(); }
uint32_t offline_EventStorage_v5::DataBuffer::buffersize() const
-{ return rep->buffersize(); }
+{ return m_rep->buffersize(); }
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h
index f0d00f3b9fa..15f3d7bed01 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataBuffer.h
@@ -9,7 +9,7 @@
#define OFFLINE_EVENTSTORAGE_V5_DATABUFFER_H
#include <string>
-#include <v5_ESCompression.h>
+#include "v5_ESCompression.h"
namespace offline_EventStorage_v5 {
@@ -30,7 +30,7 @@ namespace offline_EventStorage_v5 {
private:
class implementation;
- implementation * rep;
+ implementation * m_rep;
DataBuffer(const DataBuffer& aBuf);
DataBuffer& operator= (const offline_EventStorage_v5::DataBuffer & aBuf);
diff --git a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx
index b9e34de9453..11df5db1b4e 100644
--- a/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx
+++ b/Event/ByteStreamCnvSvcLegacy/src/offline_EventStorage/v5_DataWriter.cxx
@@ -174,7 +174,7 @@ initDW(const string writingPath,
m_cFileOpen=false;
m_openFailed = false;
- mp_callBack = NULL;
+ m_callBack = NULL;
m_fmdStrings = fmdStrings;
@@ -471,9 +471,9 @@ DWError DataWriter::closeFile()
if(fileExists(nameFile(FINISHED)) && m_cFileOpen)
{
ERS_DEBUG(2,"Finished file "<<nameFile(FINISHED));
- if(mp_callBack != NULL) {
+ if(m_callBack != NULL) {
ERS_DEBUG(3,"Execute callback from DataWriter.");
- mp_callBack->FileWasClosed(
+ m_callBack->FileWasClosed(
m_filenamecallback->getCurrentFileName(),
nameFile(FINISHED),
m_streamType,
@@ -597,9 +597,9 @@ void DataWriter::openNextFile()
m_cFileOpen = m_cFile.good();
m_openFailed = !m_cFile.good();
- if((mp_callBack != NULL) && m_cFileOpen) {
+ if((m_callBack != NULL) && m_cFileOpen) {
ERS_DEBUG(3,"Execute callback from DataWriter.");
- mp_callBack->FileWasOpened(
+ m_callBack->FileWasOpened(
m_filenamecallback->getCurrentFileName(),
nameFile(UNFINISHED),
m_streamType,
@@ -730,9 +730,9 @@ void DataWriter::file_record(const offline_EventStorage_v5::freeMetaDataStrings&
}
void DataWriter::registerCallBack(DataWriterCallBack *pUserCBclass) {
- mp_callBack = pUserCBclass;
- if(mp_callBack != NULL) {
- mp_callBack->FileWasOpened(
+ m_callBack = pUserCBclass;
+ if(m_callBack != NULL) {
+ m_callBack->FileWasOpened(
m_filenamecallback->getCurrentFileName(),
nameFile(UNFINISHED),
m_streamType,
--
GitLab