The internal header directory conflicted with in-source builds causing a build failure. This is fixed by renaming the internal header directory to something other than maxscale. The renaming pointed out a few problems in a couple of source files that appeared to include internal headers when the headers were in fact public headers. Fixed maxctrl in-source builds by making the copying of the sources optional.
		
			
				
	
	
		
			40 lines
		
	
	
		
			831 B
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			40 lines
		
	
	
		
			831 B
		
	
	
	
		
			C++
		
	
	
	
	
	
#pragma once
 | 
						|
/*
 | 
						|
 * Copyright (c) 2016 MariaDB Corporation Ab
 | 
						|
 *
 | 
						|
 * Use of this software is governed by the Business Source License included
 | 
						|
 * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
 | 
						|
 *
 | 
						|
 * Change Date: 2020-01-01
 | 
						|
 *
 | 
						|
 * On the date above, in accordance with the Business Source License, use
 | 
						|
 * of this software will be governed by version 2 or later of the General
 | 
						|
 * Public License.
 | 
						|
 */
 | 
						|
 | 
						|
#include <maxscale/cppdefs.hh>
 | 
						|
#include <maxscale/session.h>
 | 
						|
 | 
						|
namespace maxscale
 | 
						|
{
 | 
						|
/**
 | 
						|
 * Specialization of RegistryTraits for the session registry.
 | 
						|
 */
 | 
						|
template<>
 | 
						|
struct RegistryTraits<MXS_SESSION>
 | 
						|
{
 | 
						|
    typedef uint64_t id_type;
 | 
						|
    typedef MXS_SESSION* entry_type;
 | 
						|
 | 
						|
    static id_type get_id(entry_type entry)
 | 
						|
    {
 | 
						|
        return entry->ses_id;
 | 
						|
    }
 | 
						|
    static entry_type null_entry()
 | 
						|
    {
 | 
						|
        return NULL;
 | 
						|
    }
 | 
						|
};
 | 
						|
 | 
						|
}
 |