Drizzle

Merge lp:~trond-norbye/drizzle/find_if into lp:~brianaker/drizzle/build

  1. find_if
  2. Merge into build
Proposed by Trond Norbye
Status: Merged
Merged at revision: not available
Proposed branch: lp:~trond-norbye/drizzle/find_if
Merge into: lp:~brianaker/drizzle/build
Diff against target: 16 lines (+3/-3)
1 file modified
drizzled/plugin/info_schema_table.h (+3/-3)
To merge this branch: bzr merge lp:~trond-norbye/drizzle/find_if
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Stewart Smith (community) Approve
Monty Taylor (community) Approve
Review via email: mp+15362@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Trond Norbye (trond-norbye) wrote :

Fix compilation problems on Sun Studio. find_if is defined in the std:: namespace

Revision history for this message
Monty Taylor (mordred) wrote :

Love it.

review: Approve
Revision history for this message
Stewart Smith (stewart) :
review: Approve
Revision history for this message
Jay Pipes (jaypipes) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzled/plugin/info_schema_table.h'
2--- drizzled/plugin/info_schema_table.h 2009-11-29 06:36:00 +0000
3+++ drizzled/plugin/info_schema_table.h 2009-11-29 12:05:26 +0000
4@@ -537,9 +537,9 @@
5 void addRow(unsigned char *buf, size_t len)
6 {
7 uint32_t cs= drizzled::hash::crc32((const char *) buf, len);
8- Rows::iterator it= find_if(rows.begin(),
9- rows.end(),
10- FindRowByChecksum(cs));
11+ Rows::iterator it= std::find_if(rows.begin(),
12+ rows.end(),
13+ FindRowByChecksum(cs));
14 if (it == rows.end())
15 {
16 InfoSchemaRecord *record= new InfoSchemaRecord(buf, len);

Subscribers

People subscribed via source and target branches