Skip to content
Snippets Groups Projects
Commit 0870b7f6 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Merge branch 'GAUDI-1124' into 'master'

remove usage of "#pragma once"

Fixes GAUDI-1124.

See merge request !66
parents 57f356c5 0f23c1bb
No related branches found
No related tags found
No related merge requests found
#pragma once #ifndef GAUDIKERNEL_DATAOBJECTDESCRIPTOR_H
#define GAUDIKERNEL_DATAOBJECTDESCRIPTOR_H
#include <GaudiKernel/MinimalDataObjectHandle.h> #include <GaudiKernel/MinimalDataObjectHandle.h>
#include <GaudiKernel/GaudiException.h> #include <GaudiKernel/GaudiException.h>
...@@ -299,3 +300,5 @@ public: ...@@ -299,3 +300,5 @@ public:
private: private:
DataObjectDescriptorCollection * m_dataItems; DataObjectDescriptorCollection * m_dataItems;
}; };
#endif
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
#if !defined(AFX_LIBSYMBOLINFO_H__1A7003B4_BA53_11D1_AE46_1CFB51000000__INCLUDED_) #if !defined(AFX_LIBSYMBOLINFO_H__1A7003B4_BA53_11D1_AE46_1CFB51000000__INCLUDED_)
#define AFX_LIBSYMBOLINFO_H__1A7003B4_BA53_11D1_AE46_1CFB51000000__INCLUDED_ #define AFX_LIBSYMBOLINFO_H__1A7003B4_BA53_11D1_AE46_1CFB51000000__INCLUDED_
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
#include <string> #include <string>
#include <iostream> #include <iostream>
...@@ -16,7 +12,7 @@ ...@@ -16,7 +12,7 @@
#include <assert.h> #include <assert.h>
#include <windows.h> #include <windows.h>
class CLibSymbolInfo class CLibSymbolInfo
{ {
public: public:
CLibSymbolInfo(); CLibSymbolInfo();
...@@ -28,7 +24,7 @@ protected: ...@@ -28,7 +24,7 @@ protected:
std::string m_strResultsString; std::string m_strResultsString;
std::string m_strErrorMsg; std::string m_strErrorMsg;
BOOL Dump(LPTSTR lpszLibPathName, std::ostream& pFile); BOOL Dump(LPTSTR lpszLibPathName, std::ostream& pFile);
BOOL IsRegularLibSymbol( PSTR pszSymbolName ); BOOL IsRegularLibSymbol( PSTR pszSymbolName );
BOOL IsFiltedSymbol( std::string& pszSymbolName ); BOOL IsFiltedSymbol( std::string& pszSymbolName );
DWORD ConvertBigEndian(DWORD bigEndian); DWORD ConvertBigEndian(DWORD bigEndian);
...@@ -39,13 +35,13 @@ enum errMMF { errMMF_NoError, errMMF_FileOpen, ...@@ -39,13 +35,13 @@ enum errMMF { errMMF_NoError, errMMF_FileOpen,
class MEMORY_MAPPED_FILE class MEMORY_MAPPED_FILE
{ {
public: public:
MEMORY_MAPPED_FILE( PSTR pszFileName ); MEMORY_MAPPED_FILE( PSTR pszFileName );
~MEMORY_MAPPED_FILE(void); ~MEMORY_MAPPED_FILE(void);
PVOID GetBase( void ){ return m_pMemoryMappedFileBase; } PVOID GetBase( void ){ return m_pMemoryMappedFileBase; }
DWORD GetFileSize( void ){ return m_cbFile; } DWORD GetFileSize( void ){ return m_cbFile; }
BOOL IsValid( void ) { return errMMF_NoError == m_errCode; } BOOL IsValid( void ) { return errMMF_NoError == m_errCode; }
errMMF GetErrorType(){ return m_errCode; } errMMF GetErrorType(){ return m_errCode; }
private: private:
...@@ -54,9 +50,9 @@ class MEMORY_MAPPED_FILE ...@@ -54,9 +50,9 @@ class MEMORY_MAPPED_FILE
HANDLE m_hFileMapping; // Handle of memory mapped file HANDLE m_hFileMapping; // Handle of memory mapped file
PVOID m_pMemoryMappedFileBase; PVOID m_pMemoryMappedFileBase;
DWORD m_cbFile; DWORD m_cbFile;
errMMF m_errCode; errMMF m_errCode;
}; };
typedef MEMORY_MAPPED_FILE* PMEMORY_MAPPED_FILE; typedef MEMORY_MAPPED_FILE* PMEMORY_MAPPED_FILE;
#endif // !defined(AFX_LIBSYMBOLINFO_H__1A7003B4_BA53_11D1_AE46_1CFB51000000__INCLUDED_) #endif // !defined(AFX_LIBSYMBOLINFO_H__1A7003B4_BA53_11D1_AE46_1CFB51000000__INCLUDED_)
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment