blob: 75fd7602f90caf63dbddf41c8d75d15f776488a9 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
--- src/util/valueunit.h.orig Wed Aug 18 23:48:05 2004
+++ src/util/valueunit.h Thu Aug 19 00:04:04 2004
@@ -15,10 +15,10 @@
const Value& value() const { return value_; }
const std::string& unit() const { return unit_; }
-private:
+protected:
Value value_;
std::string unit_;
- friend std::istream& operator >> <> (std::istream& in, ValueUnit<Value>& vu);
+ friend std::istream& operator >> (std::istream& in, ValueUnit<Value>& vu);
};
template <typename Tp>
@@ -44,7 +44,6 @@
* Special case for float, since readig a float from "14em" barfs, guessing
* that the 'e' is for an exponent.
*/
-template<>
std::istream& operator >> (std::istream& in, ValueUnit<float>& vu) {
in >> std::ws;
std::string value;
|