Skip to content

Testing pull request #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CristinaCristescu wants to merge 2 commits into from
Closed

Testing pull request #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b58e3be
testing commit
CristinaCristescu Jul 10, 2013
b94312b
Adjust to coding convention.
CristinaCristescu Jul 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions core/meta/inc/TClassAttributeMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,18 @@
#ifndef ROOT_THashTable
#include "THashTable.h"
#endif
#ifndef ROOT_TEnumConstant
#include "TEnumConstant.h"
Copy link
Owner

@Axel-Naumann Axel-Naumann Jul 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually we don't need this - this type is not used anywhere in the header. Can you remove the include in a subsequent pull request?

Copy link
Owner

@Axel-Naumann Axel-Naumann Jul 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done it myself now (it broke the ROOT build) in commit 9c79a9a

#endif


class TClassAttributeMap : public TObject {

private:

THashTable fStringProperty; //all properties of String type
THashTable fIntProperty; //all properties of Int type

class TClassAttributeMap : public TObject
{
public:

TClassAttributeMap();
Expand All @@ -40,20 +48,15 @@ class TClassAttributeMap : public TObject
void AddProperty(const char* key, Int_t value);
void AddProperty(const char* key, const char* value);
Bool_t HasKey(const char* key) const;
const char *GetPropertyAsString(const char* key) const;
const char *GetPropertyAsString(const char* key) const;
Int_t GetPropertyAsInt(const char* key) const;
Int_t GetPropertySize() const;
Int_t RemovePropertyInt(const char* key);
TString RemovePropertyString(const char* key);
Bool_t RemoveProperty(const char* key);
void Clear(Option_t* option = "");

private:

THashTable fStringProperty; //all properties of String type
THashTable fIntProperty; //all properties of Int type

ClassDef(TClassAttributeMap,1) // Container for name/value pairs of TClass attributes
ClassDef(TClassAttributeMap,1) // Container for name/value pairs of TClass attributes
};

#endif // ROOT_TClassAttributeMap
Expand Down