OpenCMT/uLib
1
0
Fork 0
mirror of https://github.com/OpenCMT/uLib.git synced 2025-12-06 07:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for building issue after svn import

Browse Source
This commit is contained in:
AndreaRigoni
2015-06-05 14:33:22 +02:00
parent 9120c65c3e
commit fe6d8e9e4e
8 changed files with 573 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Archives.h
View File

@@ -397,8 +397,7 @@ namespace Archive {
// XML //
class xml_iarchive :
public boost::archive::xml_iarchive_impl<xml_iarchive>,
public boost::archive::detail::shared_ptr_helper
public boost::archive::xml_iarchive_impl<xml_iarchive>
{
typedef xml_iarchive Archive;
typedef boost::archive::xml_iarchive_impl<Archive> base;
@@ -529,8 +528,7 @@ public:
// TEXT //
class text_iarchive :
public boost::archive::text_iarchive_impl<text_iarchive>,
public boost::archive::detail::shared_ptr_helper
public boost::archive::text_iarchive_impl<text_iarchive>
{
typedef text_iarchive Archive;
typedef boost::archive::text_iarchive_impl<Archive> base;
@@ -604,8 +602,7 @@ public:
// SIMPLE HUMAN READABLE TEXT //
class hrt_iarchive :
public boost::archive::text_iarchive_impl<hrt_iarchive>,
public boost::archive::detail::shared_ptr_helper
public boost::archive::text_iarchive_impl<hrt_iarchive>
{
typedef hrt_iarchive Archive;
typedef boost::archive::text_iarchive_impl<Archive> base;

2
src/Core/Object.cpp
View File

@@ -46,7 +46,7 @@ namespace uLib {
const char *Version::PackageName = PACKAGE_NAME;
const char *Version::VersionNumber = PACKAGE_VERSION;
const char *Version::Release = SVN_REVISION;
const char *Version::Release = ""; //SVN_REVISION;
////////////////////////////////////////////////////////////////////////////////

18
src/Math/Dense.cpp
View File

@@ -51,14 +51,14 @@
// NEW //
ULIB_SERIALIZE(uLib::Vector2i) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector3i) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector4i) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector2f) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector3f) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector4f) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector2d) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector3d) { ar & boost::serialization::make_nvp(NULL,ob); }
ULIB_SERIALIZE(uLib::Vector4d) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector2i) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector3i) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector4i) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector2f) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector3f) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector4f) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector2d) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector3d) { ar & boost::serialization::make_nvp(NULL,ob); }
//ULIB_SERIALIZE(uLib::Vector4d) { ar & boost::serialization::make_nvp(NULL,ob); }

12
src/Root/RootHitRaw.h
View File

@@ -50,15 +50,15 @@ public:
class HitRaw
{
public:
virtual Int_t Flags() {}
virtual Int_t Chm() const {}
virtual Int_t Rob() const {}
virtual Int_t Tdc() const {}
virtual Int_t Ch() const {}
virtual Int_t Flags();
virtual Int_t Chm() const;
virtual Int_t Rob() const;
virtual Int_t Tdc() const;
virtual Int_t Ch() const;
virtual void SetFlags (Int_t flags) = 0;
virtual void SetChamber(Int_t cmb) = 0;
virtual void SetChannel(Int_t Rob, Int_t Tdc, Int_t Ch) = 0;
virtual float operator() ( ) {}
virtual float operator() ();
protected:
virtual ~HitRaw() {}
};