Commit 90df64f1 authored by Karl Herbig's avatar Karl Herbig

Merge cleanup

parent b50edab5
......@@ -25,7 +25,6 @@
</Linker>
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="Release_RaspberryPi" CompilerType="Cross GCC ( arm-linux-gnueabihf )" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Configuration Name="Release_RaspberryPi" CompilerType="Cross GCC (arm-linux-gnueabihf)" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-pedantic-errors;-Wfatal-errors;-O1;-pedantic;-W;-std=c++11;-Wall;-fPIC" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
......@@ -67,7 +66,7 @@
</Completion>
</Configuration>
<Configuration Name="Release_Ubuntu" CompilerType="GCC" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
<Compiler Options="-pedantic-errors;-Wfatal-errors;-O1;-pedantic;-W;-std=c++14;-Wall;-fPIC" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<Compiler Options="-pedantic-errors;-Wfatal-errors;-O1;-pedantic;-W;-std=c++14;-Wall;-fPIC;-march=core2;-mtune=intel" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0">
<IncludePath Value="."/>
<IncludePath Value="../../include"/>
</Compiler>
......
......@@ -5,10 +5,12 @@
<WorkspaceConfiguration Name="Release_Ubuntu" Selected="yes">
<Environment/>
<Project Name="JsonPP" ConfigName="Release_Ubuntu"/>
<Project Name="JsonPP" ConfigName="Release_Ubuntu"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="Release_RaspberryPi" Selected="no">
<WorkspaceConfiguration Name="Release_RaspberryPi" Selected="yes">
<Environment/>
<Project Name="JsonPP" ConfigName="Release_RaspberryPi"/>
<Project Name="JsonPP" ConfigName="Release_RaspberryPi"/>
</WorkspaceConfiguration>
</BuildMatrix>
</CodeLite_Workspace>
......@@ -33,11 +33,7 @@ Value::Value ( Object&& obj ) : _type ( ValueType::Object ), _objValue ( move (
Value::Value ( std::nullptr_t ) : _type ( ValueType::Null ) {}
<<<<<<< HEAD
Value::Value ( const initializer_list<Value> list ) : _type ( ValueType::Array ), _aryValue ( list ) {}
=======
Value::Value(const initializer_list<Value> list) : _type ( ValueType::Array ), _aryValue ( list ) {}
>>>>>>> fc06715cdf035e9d87b66c5410867101247fc219
Value::Value ( const Value& other )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment