Skip to content

Add Load manufacturer names interface to PidStoreLoader #2061

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

Open
zayeralam wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Load manufacturer names interface to PidStoreLoader #2061

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e2e5c6
Add Load manufacturer names interface to PidStoreLoader
zayeralam Aug 2, 2026
e07f535
Fix accidental newline in PidStoreLoader.h
zayeralam Aug 5, 2026
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
5 changes: 2 additions & 3 deletions common/rdm/PidStoreLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ class PidStoreLoader {
* contents.
* @returns A pointer to a new RootPidStore or NULL if loading failed.
*/
const RootPidStore *LoadFromStream(std::istream *data,
bool validate = true);

const RootPidStore *LoadFromStream(std::istream *data, bool validate = true);
const RootPidStore *LoadManufacturerNames(const std::string &file);
private:
Comment on lines +75 to 76

@peternewman peternewman Sep 25, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't know why the annotation isn't showing in place, but cpplint is now showing this:
./common/rdm/PidStoreLoader.h:76: "private:" should be preceded by a blank line [whitespace/blank_line] [3]

You need to do this to fix it:

Suggested change
const RootPidStore *LoadManufacturerNames(const std::string &file);
private:
const RootPidStore *LoadManufacturerNames(const std::string &file);
private:

But we'll also want the new function inset, so ultimately this:

Suggested change
const RootPidStore *LoadManufacturerNames(const std::string &file);
private:
const RootPidStore *LoadManufacturerNames(const std::string &file);
private:

typedef std::map<uint16_t, const PidDescriptor*> PidMap;
typedef std::map<uint16_t, PidMap*> ManufacturerMap;
Expand Down
Loading