From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/ricci common/File.cpp common/Variable.cp ...
Date: 14 Mar 2008 20:06:40 -0000 [thread overview]
Message-ID: <20080314200640.2548.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2008-03-14 20:06:39
Modified files:
ricci/common : File.cpp Variable.cpp utils.cpp
ricci/include : shred_allocator.h
Log message:
Fixes for building with gcc 4.3.0
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/File.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Variable.cpp.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/utils.cpp.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/shred_allocator.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/ricci/common/File.cpp 2008/01/02 20:47:34 1.7
+++ conga/ricci/common/File.cpp 2008/03/14 20:06:39 1.8
@@ -139,17 +139,17 @@
MutexLocker l(*_mutex);
long len = size();
- const auto_ptr<char> buff(new char[len]);
+ char buff[len];
try {
((fstream *) _pimpl->fs)->seekg(0, ios::beg);
check_failed();
- ((fstream *) _pimpl->fs)->read(buff.get(), len);
+ ((fstream *) _pimpl->fs)->read(buff, len);
check_failed();
- String ret(buff.get(), len);
- ::shred(buff.get(), len);
+ String ret(buff, len);
+ ::shred(buff, len);
return ret;
} catch ( ... ) {
- ::shred(buff.get(), len);
+ ::shred(buff, len);
throw;
}
}
--- conga/ricci/common/Variable.cpp 2008/01/02 20:47:34 1.11
+++ conga/ricci/common/Variable.cpp 2008/03/14 20:06:39 1.12
@@ -26,6 +26,8 @@
#include <stdio.h>
+#include <vector>
+#include <algorithm>
using namespace std;
// ##### class Variable #####
--- conga/ricci/common/utils.cpp 2008/02/05 18:29:05 1.13
+++ conga/ricci/common/utils.cpp 2008/03/14 20:06:39 1.14
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <math.h>
#include <errno.h>
+#include <limits.h>
#include <openssl/md5.h>
//#include <iostream>
--- conga/ricci/include/shred_allocator.h 2007/09/18 21:01:00 1.5
+++ conga/ricci/include/shred_allocator.h 2008/03/14 20:06:39 1.6
@@ -33,6 +33,12 @@
#ifndef __CONGA_SHRED_ALLOCATOR_H
#define __CONGA_SHRED_ALLOCATOR_H
+extern "C" {
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+}
+
#include <new>
template<typename _Tp>
reply other threads:[~2008-03-14 20:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080314200640.2548.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.