From 3bac0111b0fbac52d58e215b1b1806eae84d6869 Mon Sep 17 00:00:00 2001
From: Sirio Builder <spalacino@sirio-is.it>
Date: Tue, 30 Jun 2020 12:26:45 +0200
Subject: [PATCH] 2Patch level        : 12.0 no-patch Files correlati     :
 build ba cg Commento            : Correzioni cg problemi compilazione

---
 build/Ba2.vcxproj           |  4 ++--
 build/Ba3.vcxproj           | 10 +---------
 build/Ba3.vcxproj.filters   | 13 ++-----------
 build/Bacnv.vcxproj         |  3 ++-
 build/Bacnv.vcxproj.filters |  6 ++++++
 src/ba/ba3100.cpp           |  2 +-
 src/cg/cglib06.cpp          | 18 +++++++++++++++++-
 7 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/build/Ba2.vcxproj b/build/Ba2.vcxproj
index b8749fe18..d3205a022 100644
--- a/build/Ba2.vcxproj
+++ b/build/Ba2.vcxproj
@@ -68,7 +68,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\xi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\xi;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;XVT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -122,7 +122,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\src\include;..\src\xvaga;..\xi;..\src\xvtdb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation>false</BrowseInformation>
diff --git a/build/Ba3.vcxproj b/build/Ba3.vcxproj
index a2452e39c..19cbc38d7 100644
--- a/build/Ba3.vcxproj
+++ b/build/Ba3.vcxproj
@@ -229,15 +229,8 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\src\ba\prova.uml" />
-    <ClCompile Include="..\src\cg\cg2103.cpp" />
     <ClCompile Include="..\src\cg\cglib01.cpp" />
-    <ClCompile Include="..\src\cg\cglib03.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
+    <ClCompile Include="..\src\cg\cglib03.cpp" />
     <ClCompile Include="..\src\cg\cgpagame.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -270,7 +263,6 @@
     <ClInclude Include="..\src\ba\ba3700.h" />
     <ClInclude Include="..\src\ba\ba3800.h" />
     <ClInclude Include="..\src\ba\ba3a00a.h" />
-    <ClInclude Include="..\src\ba\prova.h" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuildStep Include="..\lib\AgaLib.lib">
diff --git a/build/Ba3.vcxproj.filters b/build/Ba3.vcxproj.filters
index 0c985bf70..ecfae2123 100644
--- a/build/Ba3.vcxproj.filters
+++ b/build/Ba3.vcxproj.filters
@@ -51,21 +51,15 @@
     <ClCompile Include="..\src\ba\ba3a00.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cg2103.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cglib01.cpp">
+    <ClCompile Include="..\src\cg\cgpagame.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="..\src\cg\cglib03.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cgpagame.cpp">
+    <ClCompile Include="..\src\cg\cglib01.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\ba\prova.uml">
-      <Filter>Masks</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <MskCompiler Include="..\src\ba\ba3200a.uml">
@@ -136,9 +130,6 @@
     <ClInclude Include="..\src\ba\ba3a00a.h">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\ba\prova.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
diff --git a/build/Bacnv.vcxproj b/build/Bacnv.vcxproj
index d979d80d8..447d105f9 100644
--- a/build/Bacnv.vcxproj
+++ b/build/Bacnv.vcxproj
@@ -122,7 +122,6 @@
       <PreprocessorDefinitions>_DEBUG;WIN32;DBG;__LONGDOUBLE__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -177,6 +176,8 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\src\cg\cglib06.cpp" />
+    <ClCompile Include="..\src\cg\cgsaldac.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuildStep Include="..\lib\AgaLib.lib">
diff --git a/build/Bacnv.vcxproj.filters b/build/Bacnv.vcxproj.filters
index 844734dc9..3ec9a165e 100644
--- a/build/Bacnv.vcxproj.filters
+++ b/build/Bacnv.vcxproj.filters
@@ -24,6 +24,12 @@
     <ClCompile Include="..\src\cg\cglib02.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cg\cglib06.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cg\cgsaldac.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="campo.rc" />
diff --git a/src/ba/ba3100.cpp b/src/ba/ba3100.cpp
index c6b0560b4..23e25b641 100755
--- a/src/ba/ba3100.cpp
+++ b/src/ba/ba3100.cpp
@@ -3,7 +3,7 @@
 #include <recarray.h>
 #include <tabapp.h>
 
-#include "../cg/cglib03.h"
+#include "../cg/cglib.h"
  
 #include "../cg/cgtbcam.h" 
 #include "../cg/cgtbdel.h"
diff --git a/src/cg/cglib06.cpp b/src/cg/cglib06.cpp
index ac9684576..569ec0417 100644
--- a/src/cg/cglib06.cpp
+++ b/src/cg/cglib06.cpp
@@ -1,5 +1,4 @@
 #include "cglib.h"
-#include "cg2101.h"
 #include "cgsaldac.h"
 
 
@@ -375,6 +374,23 @@ real TMovimento_contabile::imposta(const char * codiva) const
 // Aggiustamento movimenti rovinati o convertiti male
 ///////////////////////////////////////////////////////////
 
+class TConti_array : private TAssoc_array
+{
+public:  // TObject
+  virtual bool ok() const { return items() != 0; }
+
+public:
+  bool add(const TBill& conto, const real& importo);
+  real importo(const TBill& conto);
+  bool remove(const TBill& conto);
+
+  bool add_iva(bool det, const real& importo);
+  real importo_iva(bool det);
+  bool remove_iva(bool det);
+
+  TConti_array() {}
+  virtual ~TConti_array() {}
+};
 
 bool TConti_array::add(const TBill& conto, const real& importo)
 {