remove some output formatting stuff that we don't use

--HG--
extra : convert_revision : 367917499d3d7aebd0a91dad28c915bc85def624

diff --git a/src/base/cprintf.hh b/src/base/cprintf.hh
index 6b2a77f9023abba8311fa4899f4c211b236bc71e..9967b0578379de46ec7cc3526f92c314d160b3fb 100644 (file)
--- a/src/base/cprintf.hh
+++ b/src/base/cprintf.hh
@@ -165,36 +165,6 @@ __csprintf(const std::string &format, ArgList &args)
 #define csprintf(args...) \
     __csprintf__(args, cp::ArgListNull())
 
-template<class T>
-inline ArgList &
-operator<<(ArgList &list, const T &data)
-{
-    list.append(data);
-    return list;
-}
-
-inline ArgList &
-operator<<(std::ostream &str, ArgList &list)
-{
-    list.stream = &str;
-    return list;
-}
-
-class ArgListTemp
-{
-  private:
-    std::string format;
-    ArgList *args;
-
-  public:
-    ArgListTemp(const std::string &f) : format(f) { args = new ArgList; }
-    ~ArgListTemp() { args->dump(format); delete args; }
-
-    operator ArgList *() { return args; }
-};
-
-#define cformat(format) \
-    (*((cp::ArgList *)cp::ArgListTemp(format)))
 }
 
 #endif // __CPRINTF_HH__

diff --git a/src/unittest/cprintftest.cc b/src/unittest/cprintftest.cc
index a05426356e9336e8d9f9be1652d3f1243054419b..a454be05e799d5a873eca426f7fc82bba2456534 100644 (file)
--- a/src/unittest/cprintftest.cc
+++ b/src/unittest/cprintftest.cc
@@ -48,9 +48,6 @@ main()
     cprintf("%%s%-10s %c he went home \'\"%d %#o %#x %1.5f %1.2E\n",
             "hello", 'A', 1, 0xff, 0xfffffffffffffULL, 3.141592653589, 1.1e10);
 
-    cout << cformat("%s %#x %s\n") << "hello" << 0 << "foo 0\n";
-    cerr << cformat("%s %#x\n") << "hello" << 1 << "foo 1\n";
-
     cprintf("another test\n");
 
     stringstream buffer;