fix ambiguous cast on linux/gcc

bobbychunker · Apr 28, 2009 · aa5e50c · aa5e50c
2 parents 2ea5700 + f4f56f4
commit aa5e50c
Show file tree

Hide file tree

Showing 23 changed files with 218 additions and 438 deletions.
diff --git a/includes/playdar/application.h b/includes/playdar/application.h
@@ -8,10 +8,8 @@
 #include <string>
 #include <boost/function.hpp>
 
-#include "playdar/playable_item.hpp"
 #include "playdar/config.hpp"
 #include "playdar/types.h"
-#include "playdar/playable_item.hpp"
 
 #define VERSION "0.1.0"
 //:::

diff --git a/includes/playdar/playable_item.hpp b/includes/playdar/playable_item.hpp
diff --git a/includes/playdar/playdar_resolver_process.hpp b/includes/playdar/playdar_resolver_process.hpp
@@ -14,7 +14,6 @@
 
 #include "json_spirit/json_spirit.h"
 #include "playdar/resolver_query.hpp"
-#include "playdar/playable_item.hpp"
 
 #define MAXBUF 4096 // max size of msg payload
 

diff --git a/includes/playdar/pluginadaptor.h b/includes/playdar/pluginadaptor.h
@@ -45,8 +45,6 @@ class PluginAdaptor
     virtual ResolverService * rs() const { return m_rs; }
     virtual const std::string hostname() const = 0;
 
-    virtual void register_resolved_item( const ri_validator&, const ri_generator& ) = 0;
-
     unsigned int targettime() const { return m_targettime; }
     unsigned short weight() const { return m_weight; }
     const bool script() const { return m_script; }

diff --git a/includes/playdar/pluginadaptor_impl.hpp b/includes/playdar/pluginadaptor_impl.hpp
@@ -94,11 +94,6 @@ class PluginAdaptorImpl : public PluginAdaptor
     {
         return m_resolver->ri_from_json(obj); 
     }
-
-    virtual void register_resolved_item( const ri_validator& v, const ri_generator& g )
-    {
-        return m_resolver->register_resolved_item( v, g );
-    }
 
 private:
     mutable playdar::utils::uuid_gen m_uuidgen;