#include <sstream>
#else
#include <strstream>
+#define istringstream(x) istrstream (x, length ())
#endif
+using namespace std;
#include "file-name-map.hh"
#include "international.hh"
#include "misc.hh"
#include "warn.hh"
-#if HAVE_SSTREAM
-using std::istringstream;
-#else
-#define istringstream(x) std::istrstream (x, length ())
-#endif
-
-using std::istream;
-using std::string;
-using std::vector;
-
void
Source_file::load_stdin ()
{
int read_count = real_size;
if (desired_size > 0)
- read_count = std::min (read_count, desired_size);
+ read_count = min (read_count, desired_size);
rewind (f);
else
{
istream_ = new istringstream ("");
- istream_->setstate (std::ios::eofbit);
- // istream_->set (std::ios::eofbit);
+ istream_->setstate (ios::eofbit);
+ // istream_->set (ios::eofbit);
}
}
return istream_;
/* this will find the '\n' character at the end of our line */
vsize lo = lower_bound (newline_locations_,
pos_str0,
- std::less<char const *> ());
+ less<char const *> ());
/* the return value will be indexed from 1 */
return lo + 1 + line_offset_;
/****************************************************************/
-const char Source_file::type_p_name_[] = "ly:source-file?";
+const char * const Source_file::type_p_name_ = "ly:source-file?";
SCM
Source_file::mark_smob () const