Changeset 111

Timestamp:

06/09/13 15:21:23 (12 years ago)

Author:

epyon

Message:

• LLVM C++ fixes part 1. LLVM ROCKS.

Location:

trunk/nv

Files:

• common.hh (modified) (1 diff)
• interface/clear_state.hh (modified) (1 diff)
• interface/mesh.hh (modified) (1 diff)
• interface/program.hh (modified) (1 diff)
• interface/vertex_buffer.hh (modified) (1 diff)
• interface/window.hh (modified) (1 diff)
• types.hh (modified) (3 diffs)

trunk/nv/common.hh

@@ -193 +193 @@
         if (p == 0)
         {
-                NV_THROW( std::bad_cast, "dynamic_cast returned NULL" );
+                NV_THROW( std::bad_cast );
         }
 

trunk/nv/interface/clear_state.hh

@@ -27 +27 @@
                 bool alpha;
 
-                color_mask() : red( true ), blue( true ), green( true ), alpha( true ) {}
+                color_mask() : red( true ), green( true ), blue( true ), alpha( true ) {}
                 color_mask( bool red, bool green, bool blue, bool alpha )
                         : red( red ), green( green ), blue( blue ), alpha( alpha ) {}

trunk/nv/interface/mesh.hh

@@ -107 +107 @@
                 vertex_attribute<T>* get_indices() 
                 {
-                        return m_indices->get_type() == type_to_enum<T>() ? ((vertex_attribute<T>*)(m_indices)); : nullptr; 
+                        return m_indices->get_type() == type_to_enum<T>() ? ((vertex_attribute<T>*)(m_indices)) : nullptr; 
                 }
 

trunk/nv/interface/program.hh

@@ -61 +61 @@
         {
         public:
-                typename T value_type;
+                typedef T value_type;
 
                 uniform( const string& name, int location, int length ) 
-                        : uniform_base( name, type_to_enum< typename T >::type, location, length ), m_value()
+                        : uniform_base( name, type_to_enum< T >::type, location, length ), m_value()
                 {}
 

trunk/nv/interface/vertex_buffer.hh

@@ -39 +39 @@
                 int get_size() const { return m_size; };
                 buffer_hint get_hint() const { return m_hint; };
+        virtual ~buffer() {}
         protected:
                 int         m_size;

trunk/nv/interface/window.hh

@@ -33 +33 @@
                 virtual void swap_buffers() = 0;
                 virtual device* get_device() = 0;
-                virtual ~window() = 0 {};
+                virtual ~window() {};
         };
 

trunk/nv/types.hh

@@ -162 +162 @@
         };
 
+        template <typename TYPE> void ConstructObject(void* object)
+        {
+                // Use placement new to call the constructor
+                new (object) TYPE;
+        }
+        template <typename TYPE> void DestructObject(void* object)
+        {
+                // Explicit call of the destructor
+                ((TYPE*)object)->TYPE::~TYPE();
+        }
+    
         struct type_entry;
 
@@ -256 +267 @@
                 std::vector<type_enum> enum_list;
 
-                template <int TYPE>
-                type_entry& base()
-                {
-                        base_type = type_db->get_type( typeid(TYPE) );
-                }
+                template <typename TYPE>
+                type_entry& base();
 
                 template <int SIZE>
-                type_entry& fields( type_field (&init_fields)[SIZE] )
-                {
-                        for (int i = 0; i < SIZE; i++)
-                        {
-                                type_field f = init_fields[i];
-                                f.type = type_db->get_type(*(f.type_inf));
-                                f.type_name = f.type->name;
-                                field_list.push_back(f);
-                        }
-                        return *this;
-                }
+                type_entry& fields( type_field (&init_fields)[SIZE] );
 
                 template <int SIZE>
@@ -342 +340 @@
                 type_info_map m_idx_types;
         };
-
-        template <typename TYPE> void ConstructObject(void* object)
-        {
-                // Use placement new to call the constructor
-                new (object) TYPE;
-        }
-        template <typename TYPE> void DestructObject(void* object)
-        {
-                // Explicit call of the destructor
-                ((TYPE*)object)->TYPE::~TYPE();
-        }
+    
+    template < typename TYPE >
+    type_entry& type_entry::base()
+    {
+        base_type = type_db->get_type( typeid(TYPE) );
+    }
+    
+    template <int SIZE>
+    type_entry& type_entry::fields( type_field (&init_fields)[SIZE] )
+    {
+        for (int i = 0; i < SIZE; i++)
+        {
+            type_field f = init_fields[i];
+            f.type = type_db->get_type(*(f.type_inf));
+            f.type_name = f.type->name;
+            field_list.push_back(f);
+        }
+        return *this;
+    }
 
 }